shish 1 год назад
Родитель
Сommit
0f735f149a
2 измененных файлов с 13 добавлено и 21 удалено
  1. 12 20
      hdApp/src/admin/billing/resultCp.vue
  2. 1 1
      hdApp/src/admin/order/itemOrder.vue

+ 12 - 20
hdApp/src/admin/billing/resultCp.vue

@@ -13,12 +13,10 @@
             placeholder=""
           ></textarea>
         </view>
+        <view style="font-size:34upx;">复制上面文字,发给客户</view>
         <view class="pay-confirm-content">
           <view>
-              <button class="admin-button-com blue big" @click="recharge()" style="width:420upx;">复制上面文字,发给客户</button>
-          </view>
-          <view style="margin-top:40upx;">
-              <button class="admin-button-com big" @click="goBack" style="width:420upx;">返回</button>
+              <button class="admin-button-com big" @click="copyBack" style="width:420upx;">复制并返回</button>
           </view>
         </view>
       </view>
@@ -55,28 +53,22 @@ export default {
         }
       })
     },
-    recharge(){
-      // 复制文本到剪贴板
+    copyBack(){
       uni.setClipboardData({
         data: this.copyText,
         success: () => {
-          uni.showToast({
-            title: '复制成功',
-            icon: 'success',
-            duration: 2000
-          });
+          uni.showToast({ title: '复制成功', icon: 'success', duration: 2000 })
+          setTimeout(() => {
+            uni.navigateBack()      
+          }, 900)
         },
         fail: () => {
-          uni.showToast({
-            title: '复制失败',
-            icon: 'none',
-            duration: 2000
-          });
+          uni.showToast({ title: '复制失败', icon: 'none', duration: 2000 })
+          setTimeout(() => {
+            uni.navigateBack()      
+          }, 1500)
         }
       });
-    },
-    goBack(){
-      uni.navigateBack()
     }
   },
 };
@@ -143,7 +135,7 @@ export default {
 }
 
 .pay-confirm-content {
-  padding: 30upx 40upx;
+  padding: 40upx 40upx;
   text-align: center;
 }
 </style>

+ 1 - 1
hdApp/src/admin/order/itemOrder.vue

@@ -18,7 +18,7 @@
             <view class="list-bottom" style="padding-top:0upx;">
               <view style="border-bottom:1upx solid #EEEEEE;padding-bottom:8upx;">
                 <span v-if="item.sendCost > 0" class="freight-text">运费 ¥{{ item.sendCost ? parseFloat(item.sendCost) : 0 }}</span>
-                <span class="app-size-30 app-bold">¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</span>
+                <span class="app-size-30 app-bold">{{item.forward==0?'':'售后付款 -'}}¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</span>
               </view>
               <view class="list-button">
                   <view class="admin-button-com middle" v-if="item.status == 2" @click.stop="sendOrderFn(item)">发货</view>