解决金额显示问题

pageC/orderFormDetail/component/commodityDetail.vue

@@ -24,10 +24,10 @@
               <view class="commodity-title">{{ item.goods_name }} </view>
               <view class="commodity-price">
                 <text style="font-size: 20rpx">￥</text>
-                <text>{{ item.price.split(".")[0] }}</text
+                <text>{{ item.sku_item.price.split(".")[0] }}</text
                 >.
                 <text style="font-size: 20rpx">{{
-                  item.price.split(".")[1]
+                  item.sku_item.price.split(".")[1]
                 }}</text>
               </view>
             </view>
@@ -44,7 +44,8 @@
           v-if="
             orderDetail.simplify_status == 'paid' ||
             orderDetail.simplify_status == 'undelivered' ||
-            orderDetail.simplify_status == 'unreview'
+            orderDetail.simplify_status == 'unreview' ||
+            orderDetail.simplify_status == 'merdelivered'
           "
         >
           <!-- status就是 状态 0未审核 1已通过 2未通过 3平台介入 -->
@@ -71,6 +72,12 @@
           >
             退款详情
           </button>
+          <button
+            @click="application(item)"
+            v-if="item.refund && item.refund.status == 2"
+          >
+            继续申请
+          </button>
           <button v-if="!item.refund" @click="application(item)">
             申请退款
           </button>

pageD/afterSalesDetail/afterSalesDetail.vue

@@ -52,7 +52,7 @@
       v-if="
         (orderInformation.goods[0].refund.status == '0' ||
           orderInformation.goods[0].refund.status == '3') &&
-        !orderInformation.goods[0].refund.is_send
+        Number(orderInformation.goods[0].refund.is_send)
       "
     >
       <button class="btn-1" @click="refuseApplication">拒绝申请</button

pageD/afterSalesManage/component/detailCard.vue

@@ -68,7 +68,8 @@
       <button
         class="btn-1"
         v-if="
-          (itemInfo.status == 0 || itemInfo.status == 3) && !itemInfo.is_send
+          (itemInfo.status == 0 || itemInfo.status == 3) &&
+          Number(itemInfo.is_send)
         "
         @click.stop="$emit('refuseRefund', itemInfo)"
       >
@@ -77,7 +78,8 @@
       <button
         class="btn-3"
         v-if="
-          (itemInfo.status == 0 || itemInfo.status == 3) && !itemInfo.is_send
+          (itemInfo.status == 0 || itemInfo.status == 3) &&
+          Number(itemInfo.is_send)
         "
         @click.stop="$emit('agreeRefund', itemInfo)"
       >

pageD/deliverGoods/deliverGoods.vue

@@ -189,6 +189,7 @@ export default {
             uni.navigateBack({
               delta: 1,
             });
+            clearTimeout(timer);
           }, 1000);
         });
     },

pageD/evaluate/evaluate.vue

@@ -10,6 +10,8 @@
         <u-rate :count="count" v-model="value" size="22"></u-rate>
       </view>
 
+      <!-- accept="all" 可以上传视频是配置该字段 -->
+
       <u-upload
         :fileList="fileList1"
         @afterRead="afterRead"
@@ -17,7 +19,6 @@
         name="1"
         multiple
         :maxCount="10"
-        accept="all"
       >
         <view class="upload-photo">
           <u-icon name="camera" size="26"></u-icon>

pageD/orderInformation/orderInformation.vue

@@ -183,7 +183,7 @@
           : "已付"
       }}</text>
       <text style="color: #f83224; font-weight: 600">{{
-        orderInformation.estimated_price
+        orderInformation.actual_price || orderInformation.estimated_price
       }}</text>
     </view>
     <view
@@ -283,6 +283,9 @@ export default {
     this.orderStauts = options.orderStatus;
     this.getDetail();
   },
+  onShow() {
+    this.getDetail();
+  },
   created() {},
   methods: {
     cope(str) {

unpackage/dist/dev/mp-weixin/pageA/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.json

@@ -1,7 +1,7 @@
 {
-  "usingComponents": {},
-  "component": true,
   "componentGenerics": {
     "scoped-slots-default": true
-  }
+  },
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pageB/Senderinfor.wxml

@@ -1 +1 @@
-<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex "><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex "><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex "><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>
+<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex"><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex"><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex"><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>

unpackage/dist/dev/mp-weixin/pageD/components/agreePopup.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "u-popup": "/uview-ui/components/u-popup/u-popup",
     "u--input": "/uview-ui/components/u--input/u--input"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/pageD/evaluate/evaluate.wxml

@@ -1 +1 @@
-<view class="data-v-fa248092"><block wx:for="{{orderDetail.goods}}" wx:for-item="item" wx:for-index="__i0__"><view class="content data-v-fa248092"><view class="goods-title data-v-fa248092"><image class="goods-img data-v-fa248092" src="{{item.goods_image}}" mode="scaleToFill"></image><view class="title data-v-fa248092">{{''+item.goods_name+''}}</view></view><view class="rate data-v-fa248092"><view class="_label data-v-fa248092">商品评价</view><u-rate bind:input="__e" vue-id="{{'4a6a8fa2-1-'+__i0__}}" count="{{count}}" size="22" value="{{value}}" data-event-opts="{{[['^input',[['__set_model',['','value','$event',[]]]]]]}}" class="data-v-fa248092" bind:__l="__l"></u-rate></view><u-upload vue-id="{{'4a6a8fa2-2-'+__i0__}}" fileList="{{fileList1}}" name="1" multiple="{{true}}" maxCount="{{10}}" accept="all" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-fa248092" bind:__l="__l" vue-slots="{{['default']}}"><view class="upload-photo data-v-fa248092"><u-icon vue-id="{{('4a6a8fa2-3-'+__i0__)+','+('4a6a8fa2-2-'+__i0__)}}" name="camera" size="26" class="data-v-fa248092" bind:__l="__l"></u-icon><text class="data-v-fa248092">添加图片/视频</text></view></u-upload><view class="_text data-v-fa248092"><u--textarea bind:input="__e" vue-id="{{'4a6a8fa2-4-'+__i0__}}" border="none" height="150" placeholder="展开说说对商品的想法" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-fa248092" bind:__l="__l"></u--textarea></view></view></block><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn-1 data-v-fa248092" bindtap="__e">提交评价</button></view>
+<view class="data-v-fa248092"><block wx:for="{{orderDetail.goods}}" wx:for-item="item" wx:for-index="__i0__"><view class="content data-v-fa248092"><view class="goods-title data-v-fa248092"><image class="goods-img data-v-fa248092" src="{{item.goods_image}}" mode="scaleToFill"></image><view class="title data-v-fa248092">{{''+item.goods_name+''}}</view></view><view class="rate data-v-fa248092"><view class="_label data-v-fa248092">商品评价</view><u-rate bind:input="__e" vue-id="{{'4a6a8fa2-1-'+__i0__}}" count="{{count}}" size="22" value="{{value}}" data-event-opts="{{[['^input',[['__set_model',['','value','$event',[]]]]]]}}" class="data-v-fa248092" bind:__l="__l"></u-rate></view><u-upload vue-id="{{'4a6a8fa2-2-'+__i0__}}" fileList="{{fileList1}}" name="1" multiple="{{true}}" maxCount="{{10}}" data-event-opts="{{[['^afterRead',[['afterRead']]],['^delete',[['deletePic']]]]}}" bind:afterRead="__e" bind:delete="__e" class="data-v-fa248092" bind:__l="__l" vue-slots="{{['default']}}"><view class="upload-photo data-v-fa248092"><u-icon vue-id="{{('4a6a8fa2-3-'+__i0__)+','+('4a6a8fa2-2-'+__i0__)}}" name="camera" size="26" class="data-v-fa248092" bind:__l="__l"></u-icon><text class="data-v-fa248092">添加图片/视频</text></view></u-upload><view class="_text data-v-fa248092"><u--textarea bind:input="__e" vue-id="{{'4a6a8fa2-4-'+__i0__}}" border="none" height="150" placeholder="展开说说对商品的想法" value="{{value1}}" data-event-opts="{{[['^input',[['__set_model',['','value1','$event',[]]]]]]}}" class="data-v-fa248092" bind:__l="__l"></u--textarea></view></view></block><button data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="btn-1 data-v-fa248092" bindtap="__e">提交评价</button></view>

unpackage/dist/dev/mp-weixin/pageD/homepage/component/goodsCard.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/commodity.wxml

@@ -1 +1 @@
-<view class="list data-v-4ed8fbfe"><view class="merchant data-v-4ed8fbfe"><image class="merchant-img data-v-4ed8fbfe" src="{{goodsList.image}}" mode="scaleToFill"></image><view class="merchant-name data-v-4ed8fbfe">{{goodsList.merchant_name}}</view></view><block wx:for="{{goodsList.order_goods}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="detail data-v-4ed8fbfe"><image class="detail-img data-v-4ed8fbfe" src="{{item.sku_item.image}}" mode></image><view class="detail-right data-v-4ed8fbfe"><view class="data-v-4ed8fbfe"><text class="toptitle data-v-4ed8fbfe">{{item.goods.name_cn}}</text><view class="weight data-v-4ed8fbfe">{{item.sku_item.item+''}}</view></view><view class="u-flex u-row-between data-v-4ed8fbfe"><view class="money data-v-4ed8fbfe"><text class="data-v-4ed8fbfe">¥</text><text style="font-size:34rpx;" class="data-v-4ed8fbfe">{{item.sku_item.price}}</text></view><view class="stepping data-v-4ed8fbfe"><u-icon vue-id="{{'e771f670-1-'+__i0__}}" name="minus" size="12" class="data-v-4ed8fbfe" bind:__l="__l"></u-icon><text class="data-v-4ed8fbfe">{{goodsValue}}</text><u-icon vue-id="{{'e771f670-2-'+__i0__}}" name="plus" size="12" class="data-v-4ed8fbfe" bind:__l="__l"></u-icon></view></view></view></view></block></view>
+<view class="list data-v-4ed8fbfe"><view class="merchant data-v-4ed8fbfe"><image class="merchant-img data-v-4ed8fbfe" src="{{goodsList.image}}" mode="scaleToFill"></image><view class="merchant-name data-v-4ed8fbfe">{{goodsList.merchant_name}}</view></view><block wx:for="{{goodsList.order_goods}}" wx:for-item="item" wx:for-index="__i0__" wx:key="id"><view class="detail data-v-4ed8fbfe"><image class="detail-img data-v-4ed8fbfe" src="{{item.sku_item.image}}" mode></image><view class="detail-right data-v-4ed8fbfe"><view class="data-v-4ed8fbfe"><text class="toptitle data-v-4ed8fbfe">{{item.goods.name_cn}}</text><view class="weight data-v-4ed8fbfe">{{item.sku_item.item+''}}</view></view><view class="u-flex u-row-between data-v-4ed8fbfe"><view class="money data-v-4ed8fbfe"><text class="data-v-4ed8fbfe">¥</text><text style="font-size:34rpx;" class="data-v-4ed8fbfe">{{item.sku_item.price}}</text></view><view class="stepping data-v-4ed8fbfe"><u-icon vue-id="{{'e771f670-1-'+__i0__}}" name="minus" size="12" data-event-opts="{{[['^click',[['$emit',['changeGoodsNum','reduce']]]]]}}" bind:click="__e" class="data-v-4ed8fbfe" bind:__l="__l"></u-icon><text class="data-v-4ed8fbfe">{{goodsValue}}</text><u-icon vue-id="{{'e771f670-2-'+__i0__}}" name="plus" size="12" data-event-opts="{{[['^click',[['$emit',['changeGoodsNum','increase']]]]]}}" bind:click="__e" class="data-v-4ed8fbfe" bind:__l="__l"></u-icon></view></view></view></view></block></view>

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/goodsInformation.wxml

@@ -1 +1 @@
-<view class="list data-v-02a158b5"><view class="abount data-v-02a158b5" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-02a158b5" style="margin-bottom:40rpx;"><view class="name data-v-02a158b5">{{i18n.Commodityamount}}</view><view class="money data-v-02a158b5">{{'¥'+(goodinfo.is_discount==1?$root.m0*$root.m1/10000:$root.m2*$root.m3/10000)+''}}</view></view><view class="u-flex u-row-between data-v-02a158b5"><view class="name data-v-02a158b5">{{i18n.Grosscommodityweight}}</view><view class="money data-v-02a158b5">{{$root.m4*value+"kg"}}</view></view><block wx:if="{{containname1}}"><view class="back u-flex data-v-02a158b5"><image style="width:32rpx;height:32rpx;" src="static/images/warning.png" mode class="data-v-02a158b5"></image><text style="margin-left:12rpx;font-size:24rpx;" class="data-v-02a158b5">{{i18n.buy+max_weight+"kg"+i18n.price+"¥"+unit_fee+"，"+i18n.morefavorable}}</text></view></block><view class="u-flex u-row-between data-v-02a158b5" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-02a158b5">{{i18n.Costperkilogram}}</view><view class="money data-v-02a158b5">{{containname1?unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-02a158b5"><view class="name data-v-02a158b5">{{i18n.freight}}</view><view class="money data-v-02a158b5">{{containname1?sum:i18n.shippingmethod}}</view></view><view class="zong u-flex u-row-right data-v-02a158b5"><view class="data-v-02a158b5"><text class="small data-v-02a158b5">{{i18n.subtotal}}</text><text class="mon data-v-02a158b5">¥</text><text class="mon data-v-02a158b5" style="font-size:40rpx;">{{goodinfo.is_discount==1?$root.m5*$root.m6/10000:$root.m7*$root.m8/10000}}</text></view></view></view></view>
+<view class="list data-v-02a158b5"><view class="abount data-v-02a158b5" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-02a158b5" style="margin-bottom:40rpx;"><view class="name data-v-02a158b5">{{i18n.Commodityamount}}</view><view class="money data-v-02a158b5">{{'¥'+goodsPrice+''}}</view></view><block wx:if="{{containname}}"><view class="u-flex u-row-between data-v-02a158b5"><view class="name data-v-02a158b5">{{i18n.Grosscommodityweight}}</view><view class="money data-v-02a158b5">{{goodsWeight*goodsValue+"kg"}}</view></view></block><block wx:if="{{containname}}"><view class="back u-flex data-v-02a158b5"><image style="width:32rpx;height:32rpx;" src="../../../static/images/warning.png" mode class="data-v-02a158b5"></image><text style="margin-left:12rpx;font-size:24rpx;" class="data-v-02a158b5">{{i18n.buy+countGoodsInformation.max_weight+"kg"+i18n.price+"¥"+countGoodsInformation.unit_fee+"，"+i18n.morefavorable}}</text></view></block><view class="u-flex u-row-between data-v-02a158b5" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-02a158b5">{{i18n.Costperkilogram}}</view><view class="money data-v-02a158b5">{{containname?countGoodsInformation.unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-02a158b5"><view class="name data-v-02a158b5">{{i18n.freight}}</view><view class="money data-v-02a158b5">{{containname?countGoodsInformation.sum:i18n.shippingmethod}}</view></view><view class="zong u-flex u-row-right data-v-02a158b5"><view class="data-v-02a158b5"><text class="small data-v-02a158b5">{{i18n.subtotal}}</text><text class="mon data-v-02a158b5">¥</text><text class="mon data-v-02a158b5" style="font-size:40rpx;">{{goodsPrice}}</text></view></view></view></view>

unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/newBulitOrder.wxss

@@ -28,6 +28,7 @@
   background: #f4f4f4;
   padding: 20rpx 24rpx;
   box-sizing: border-box;
+  padding-bottom: 200rpx;
 }
 .page .address.data-v-6701622d {
   width: 702rpx;

unpackage/dist/dev/mp-weixin/pageD/orderDetail/component/commodityDetail.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/mine/component/mallOrderForm.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pages/mine/component/mineMoney.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pages/mine/component/personalFunction.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pages/mine/component/teamFunction.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }