no message

src/pages/cash/index.vue

@@ -5,10 +5,12 @@
                 <input type="number" :maxlength="12" v-model="inputMoney" placeholder="请输入提现金额" />
             </view>
             <view class="option flex_r flex_ac flex_jb">
-                <view class="balance flex_r flex_ac">账户{{ islocal?'余额':'云宝' }}￥{{ user_money }}</view>
+                <view class="balance flex_r flex_ac">
+                    <span>账户{{ islocal?'余额':'云宝' }}：{{ user_money }}</span>
+                    <span>可提：{{ available_money }}</span>
+                </view>
                 <view class="option_text" @tap="getListPage">提现记录</view>
             </view>
-            <view class="hint">支持{{ islocal?'余额':'云宝' }}提现</view>
         </view>
         <view class="upload flex_c flex_jc flex_ac">
             <block v-if="imgs == '' || imgs == undefined">
@@ -38,6 +40,7 @@ export default {
             local_uinfo: undefined,
 
             user_money: 0, //余额
+            available_money: 0, //数智生活可提金额
 
             islocal: false
         };
@@ -152,8 +155,13 @@ export default {
             this.user_money = this.userinfo.user_money;
         },
         async getLU() {
-            this.local_uinfo = await uni.Luserfun()
+            this.local_uinfo = await uni.Luserfun();
             this.user_money = this.local_uinfo.property;
+            post("local/withdrawAmount").then((res) => {
+                if (res.code === 0) {
+                    this.available_money = res.data
+                }
+            })
         },
     },
 };
@@ -178,8 +186,14 @@ export default {
 }
 
 .balance {
-    font-size: 28rpx;
+    font-size: 26rpx;
     color: #7c838d;
+    span{
+        margin-right: 22rpx;
+        &:last-child{
+            margin-right: 0;
+        }
+    }
 }
 
 .option_text {

src/pages/index/index.vue

@@ -47,15 +47,18 @@
                         <view :class="['product-title', 'ellipsis']">{{ i.goods_name }}</view>
                         <view class="product-price">
                             <text class="product-price-original">{{ i.price }}</text>
-                            <!-- <text class="product-price-favour">￥{{i.originalPrice}}</text> -->
-                            <!-- <text class="product-tip">{{i.tip}}</text> -->
                             <text class="product-text" v-if="[3,4].includes(i.type)">赠<text class="corFE2C15">{{ i.give_cha_bao }}</text>茶宝</text>
                         </view>
+                        <view class="product-txt" v-if="i.type == 4">
+                            <text class="product-price-favour">{{i.market_price}}</text>
+                            <text class="product-text">消费金抵</text>
+                            <span class="corFE2C15">￥{{ Number(i.consume) }}</span>
+                        </view>
                         <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发券" }}</view>
                         <view class="product-txt" v-if="[3,4].includes(i.type)">限时赠送<text class="corFE2C15">{{ i.teac }}</text>TeaC</view>
                         <view class="product-txt fenxiang" v-if="[3,4].includes(i.type)">
                             <text class="iconfont red">&#xe62b;</text>
-                            <text class="red">分享约获得 {{ i.first_teac }} TeaC</text>
+                            <text class="red">分享约获得 {{ i.first_teac }} {{i.type==3?'TeaC':'现金'}}</text>
                         </view>
                     </view>
                 </view>

src/pages/product/p_details.vue

@@ -40,7 +40,7 @@
                 <view class="product-txt">限时赠送{{ detail.teac }}TeaC</view>
                 <view class="product-txt fenxiang">
                     <text class="iconfont red">&#xe62b;</text>
-                    <text class="red">分享约获得 {{ detail.first_teac }} TeaC</text>
+                    <text class="red">分享约获得 {{ detail.first_teac }} {{type==3?'TeaC':'现金'}}</text>
                 </view>
             </view>
             <view class="goods_subName">{{ detail.goodsMsg }}</view>

src/pages/product/productRetail.vue

@@ -23,7 +23,7 @@
                     <view class="product-txt" v-if="['3','4'].includes(type)">限时赠送<text class="corFE2C15">{{ i.teac }}</text>TeaC</view>
                     <view class="product-txt fenxiang" v-if="['3','4'].includes(type)">
                         <text class="iconfont red">&#xe62b;</text>
-                        <text class="red">分享约获得{{ i.first_teac }}现金</text>
+                        <text class="red">分享约获得{{ i.first_teac }}{{type==3?'TeaC':'现金'}}</text>
                     </view>
                 </view>
             </view>

src/pages/sign/index.vue

@@ -26,7 +26,7 @@
                     <view class="info_con">
                         <image class="info_img" :src="nextSign > 0 ? '/static/sgin/p_back2.png' : '/static/sgin/p_back.png'" mode="" />
                         <!-- <view class="info_texts flex_r flex_ac flex_jc" v-if="nextSign > 0">{{ timer }}</view> -->
-                        <uni-countdown class="info_texts flex_r flex_ac flex_jc" v-if="nextSign > 0" :second="nextSign" :showDay="false"/>
+                        <uni-countdown class="info_texts flex_r flex_ac flex_jc" v-if="nextSign > 0" :second="nextSign" :showDay="false" />
                         <view class="info_texts flex_r flex_ac flex_jc" @tap="setSignIn" v-else>立即签到</view>
                     </view>
                 </view>
@@ -51,16 +51,18 @@
                     <view :class="['product-title', 'ellipsis']">{{ i.goods_name }}</view>
                     <view class="product-price">
                         <text class="product-price-original">{{ i.price }}</text>
-                        <!-- <text class="product-price-favour">￥{{i.originalPrice}}</text> -->
-                        <!-- <text class="product-tip">{{i.tip}}</text> -->
                         <text class="product-text" v-if="['3','4'].includes(i.type)">赠<text class="corFE2C15">{{ i.give_cha_bao }}</text>茶宝</text>
                     </view>
+                    <view class="product-txt" v-if="i.type == 4">
+                        <text class="product-price-favour">{{i.market_price}}</text>
+                        <text class="product-text">消费金抵</text>
+                        <span class="corFE2C15">￥{{ Number(i.consume) }}</span>
+                    </view>
                     <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发券" }}</view>
-                    <!-- <view class="product-txt">赠送{{ i.give_integral ? i.give_integral + "批发券" : i.give_cha_bao + "茶宝" }}</view> -->
                     <view class="product-txt" v-if="['3','4'].includes(i.type)">限时赠送<text class="corFE2C15">{{ i.teac }}</text>TeaC</view>
                     <view class="product-txt fenxiang" v-if="['3','4'].includes(i.type)">
                         <text class="iconfont red">&#xe62b;</text>
-                        <text class="red">分享约获得 {{ i.first_teac }} TeaC</text>
+                        <text class="red">分享约获得 {{ i.first_teac }} {{i.type==3?'TeaC':'现金'}}</text>
                     </view>
                 </view>
             </view>

src/pagesB/cinema/cinemaTicket.vue

@@ -43,7 +43,7 @@
                 <div class="tit">订单详情</div>
                 <view class="label">
                     <view class="title">实付金额：</view>
-                    <view class="nums">￥{{ order.pay_amount }}</view>
+                    <view class="nums">￥{{ order.actually_paid || order.pay_amount }}</view>
                 </view>
                 <view class="label">
                     <view class="title">订单编号：</view>
@@ -87,7 +87,7 @@
                 </div>
                 <div class="li flex_r flex_jb">
                     <span>实付金额</span>
-                    <span>￥{{ order.pay_amount || 0 }}</span>
+                    <span>￥{{ order.actually_paid || order.pay_amount }}</span>
                 </div>
             </div>
             <div class="btnbar" v-if="ispay" @click="pay">立即支付

src/pagesB/directCharge/orderDetail.vue

@@ -35,7 +35,7 @@
             </div>
             <div class="li flex_r flex_jb">
                 <span>实付金额</span>
-                <span>￥{{ order.pay_amount || 0 }}</span>
+                <span>￥{{ order.actually_paid || order.pay_amount }}</span>
             </div>
         </div>
         <div class="info card">
@@ -45,7 +45,7 @@
             </template>
             <p>账号：{{ order.phone }}</p>
             <p>数量：{{ order.number }}</p>
-            <p>订单金额：￥{{ order.pay_amount }}</p>
+            <p>订单金额：￥{{ order.actually_paid || order.pay_amount }}</p>
             <p>订单编号：{{ order.trade_no }}</p>
             <p>下单时间：{{ order.create_time }}</p>
         </div>

src/pagesB/orderingfood/detail.vue

@@ -184,7 +184,7 @@ export default {
             post("local/orderDetail", da).then(res => {
                 if (res.code == 0) {
                     this.loading = false;
-					if(res.data.detail.error_code == 200){
+					if(res.data?.detail?.error_code == 200){
 						this.orderDetail = res.data.detail.data;
                         this.orderDetail.status = res.data.order.status;
 					}
@@ -202,11 +202,6 @@ export default {
                     this.orderTotal = totals;
                     this.GoodNumber = number;
                     this.getIntegral();
-                    // if(this.orderDetail.order_status=='OUT_MEAL'){
-                    //     setTimeout(() => {
-                    //         this.$refs.uqcode.createCode(this.orderDetail.code)
-                    //     }, 1000);
-                    // }
                 }
             })
         },

src/pagesB/orderingfood/orderlist.vue

@@ -12,14 +12,14 @@
                         <div class="na ellipsis">{{ a.product_name }}</div>
                     </div>
                 </div>
-                <div class="g_amount"><span class="amount dinB">{{ i.pay_amount }}</span></div>
+                <div class="g_amount"><span class="amount dinB">{{ i.actually_paid || i.pay_amount }}</span></div>
             </div>
             <div class="p2 flex_r flex_jb" v-else-if="i.type == 1">
                 <div class="Movie flex_r flex_jb" v-for="(a,b) in i.orderGoods" :key="b">
                     <div class="info flex_c flex_jb">
                         <p class="pt">{{ a.product_name }}</p>
                         <p class="p">{{ a.number }}张</p>
-                        <p class="p">实付 ￥{{ i.pay_amount }}</p>
+                        <p class="p">实付 ￥{{ i.actually_paid || i.pay_amount }}</p>
                         <p class="p">{{ neaten1(i.product_detail,i.type) }}</p>
                     </div>
                     <image class="poster" mode="aspectFill" :src="a.product_img" />
@@ -29,14 +29,14 @@
                 <div class="goods good2 ellipsis">
                     <div class="p" v-for="(a,b) in i.orderGoods" :key="b">{{ a.product_name }}</div>
                 </div>
-                <div class="g_amount"><span class="amount dinB">{{ i.pay_amount }}</span></div>
+                <div class="g_amount"><span class="amount dinB">{{ i.actually_paid || i.pay_amount }}</span></div>
             </div>
             <div class="p2 flex_r flex_jb" v-else-if="i.type == 4">
                 <div class="Movie flex_r flex_jb" v-for="(a,b) in i.orderGoods" :key="b">
                     <div class="info flex_c flex_jb">
                         <p class="pt">{{ a.product_name }}</p>
                         <p class="p">{{ a.number }}间</p>
-                        <p class="p">实付 ￥{{ i.pay_amount }}</p>
+                        <p class="p">实付 ￥{{ i.actually_paid || i.pay_amount }}</p>
                         <p class="p" v-if="a.attachment">{{ neaten2(a.attachment,i.type) }}</p>
                     </div>
                     <image class="poster" mode="aspectFill" :src="a.product_img" />
@@ -48,7 +48,7 @@
                     <div class="info flex_c flex_jb">
                         <p class="pt">{{ a.product_name }}</p>
                         <p class="p">{{ a.number }}张</p>
-                        <p class="p">实付 ￥{{ i.pay_amount }}</p>
+                        <p class="p">实付 ￥{{ i.actually_paid || i.pay_amount }}</p>
                     </div>
                 </div>
             </div>

src/pagesB/prepaidRefill/orderDetail.vue

@@ -14,7 +14,7 @@
             </div>
             <div class="li flex_r flex_jb">
                 <span>实付金额</span>
-                <span>￥{{ order.pay_amount || 0 }}</span>
+                <span>￥{{ order.actually_paid || order.pay_amount }}</span>
             </div>
         </div>
         <div class="money card">
@@ -27,7 +27,7 @@
             <p>产品品牌：{{ order.restaurant_name }}</p>
             <p>产品名称：{{ order.product_name }}</p>
             <p>充值手机号：{{ order.phone }}</p>
-            <p>订单金额：￥{{ order.pay_amount }}</p>
+            <p>订单金额：￥{{ order.actually_paid || order.pay_amount }}</p>
             <p>订单编号：{{ order.trade_no }}</p>
             <p>下单时间：{{ order.create_time }}</p>
         </div>

src/pagesB/scenicSpotTicket/orderDetail.vue

@@ -19,7 +19,7 @@
             </div>
             <div class="li flex_r flex_jb">
                 <span>实付金额</span>
-                <span>￥{{ order.pay_amount || 0 }}</span>
+                <span>￥{{ order.actually_paid || order.pay_amount }}</span>
             </div>
         </div>
         <div class="info card">
@@ -27,7 +27,7 @@
             <p>产品名称：{{ order.product_name }}</p>
             <p>数量：{{ order.number }}</p>
             <p>手机号：{{ order.phone }}</p>
-            <p>订单金额：￥{{ order.pay_amount }}</p>
+            <p>订单金额：￥{{ order.actually_paid || order.pay_amount }}</p>
             <p>订单编号：{{ order.trade_no }}</p>
             <p>下单时间：{{ order.create_time }}</p>
         </div>