update

pages/order/orderdetail/index.vue

@@ -65,6 +65,66 @@
 
     <div class="pageDesc">*自提商品的提货地址：凌云大厦一楼彩云驿购</div>
 
+    <!-- 订单商品详情 -->
+    <div class="order-box">
+      <div class="order-top" @click="goShop">
+        <div style="display: flex; align-items: center">
+          <!-- <img src="https://eshangtech.com/ShopICO/shop_ico.png" style="
+              width: 56rpx;
+              height: 36rpx;
+              vertical-align: middle;
+              margin-right: 10rpx;
+            " /> -->
+          <span class="order-addr" style="font-size: 28rpx;">{{ ShopAddress }}</span>
+        </div>
+        <van-icon name="arrow" size="30rpx" v-if="pageMsg.type === 0" />
+      </div>
+
+      <div class="order-list" v-for="(item, i) in shopOrder" :key="i">
+        <div style="display: flex;">
+          <div class="order-name">
+            {{
+              item.COMMODITY_RULE
+                ? item.COMMODITY_NAME + "(" + item.COMMODITY_RULE + ")"
+                : item.COMMODITY_NAME
+            }}
+          </div>
+          <div class="order-num">x{{ item.ORDER_COUNT }}</div>
+          <div class="order-price">￥{{ item.AVERAGE_PRICE }}</div>
+        </div>
+        <div style="font-size: 24rpx;color: #a7a7a7;margin-top:8rpx">
+          {{ item.SALEDETAIL_DESC || "" }}
+        </div>
+      </div>
+
+
+      <hr />
+
+      <div class="coupon" v-if="orderInfo.COUPON_AMOUNT">
+        <div>
+          <span>优惠券</span>
+        </div>
+        <div style="font-size: 28rpx; color: #000000; font-weight: bolder">
+          -￥{{ orderInfo.COUPON_AMOUNT }}
+        </div>
+      </div>
+      <div class="price-sum">
+        <div class="link-store" @click="callPhone">
+          <!-- <van-icon name="phone-circle-o" size="40rpx" color="#CAA97F" custom-style="margin-right:16rpx;"></van-icon>
+          联系商家 -->
+        </div>
+        <div class="">
+          <span>合计</span>
+          <span class="pay-price">￥{{ tatalMoney }}</span>
+        </div>
+      </div>
+    </div>
+
+    <!-- 二维码的框 -->
+    <div class="qrCodeBox">
+
+    </div>
+    <!-- 订单详情 -->
     <div class="order-info">
       <p class="order-info-type order-info-h">
         <!-- :class="{ appoint: orderInfo.TAKE_TYPE === 2000 }" -->
@@ -148,60 +208,6 @@
       </block>
     </div>
 
-    <div class="order-box">
-      <div class="order-top" @click="goShop">
-        <div style="display: flex; align-items: center">
-          <!-- <img src="https://eshangtech.com/ShopICO/shop_ico.png" style="
-              width: 56rpx;
-              height: 36rpx;
-              vertical-align: middle;
-              margin-right: 10rpx;
-            " /> -->
-          <span class="order-addr">{{ ShopAddress }}</span>
-        </div>
-        <van-icon name="arrow" size="30rpx" v-if="pageMsg.type === 0" />
-      </div>
-
-      <div class="order-list" v-for="(item, i) in shopOrder" :key="i">
-        <div style="display: flex;">
-          <div class="order-name">
-            {{
-              item.COMMODITY_RULE
-                ? item.COMMODITY_NAME + "(" + item.COMMODITY_RULE + ")"
-                : item.COMMODITY_NAME
-            }}
-          </div>
-          <div class="order-num">x{{ item.ORDER_COUNT }}</div>
-          <div class="order-price">￥{{ item.AVERAGE_PRICE }}</div>
-        </div>
-        <div style="font-size: 24rpx;color: #a7a7a7;margin-top:8rpx">
-          {{ item.SALEDETAIL_DESC || "" }}
-        </div>
-      </div>
-
-
-      <hr />
-
-      <div class="coupon" v-if="orderInfo.COUPON_AMOUNT">
-        <div>
-          <span>优惠券</span>
-        </div>
-        <div style="font-size: 28rpx; color: #000000; font-weight: bolder">
-          -￥{{ orderInfo.COUPON_AMOUNT }}
-        </div>
-      </div>
-      <div class="price-sum">
-        <div class="link-store" @click="callPhone">
-          <!-- <van-icon name="phone-circle-o" size="40rpx" color="#CAA97F" custom-style="margin-right:16rpx;"></van-icon>
-          联系商家 -->
-        </div>
-        <div class="">
-          <span>合计</span>
-          <span class="pay-price">￥{{ tatalMoney }}</span>
-        </div>
-      </div>
-    </div>
-
     <uni-popup ref="payPopup" :safe-area="false">
       <div class="payShowBox">
         <div class="payBoxTitle">支付方式</div>
@@ -1114,6 +1120,17 @@ page {
   // box-shadow 0 2rpx 16rpx 0.4rpx #e2e2e2
 }
 
+.qrCodeBox {
+  width: calc(100vw - 48rpx);
+  height: 500rpx;
+  background-color: #fff;
+  box-sizing: border-box;
+  padding: 0 24rpx;
+  margin-left: 24rpx;
+  border-radius: 16rpx;
+  margin-bottom: 20rpx;
+}
+
 .pageDesc {
   width: 100%;
   text-align: left;
@@ -1129,10 +1146,11 @@ page {
   justify-content: space-between;
   align-items: center;
   font-size: 30rpx;
-  border-bottom: 1rpx solid #f5f5f5;
+  border-bottom: 1rpx solid #e6e6e6;
-  height: 100rpx;
+  // height: 100rpx;
+  padding: 16rpx 0;
   box-sizing: border-box;
-  margin-bottom: 24rpx;
+  // margin-bottom: 24rpx;
 }
 
 .coupon {

pages/order/orderdetail/reasonforRefund.vue

@@ -25,9 +25,13 @@
             item.value === 2099 || item.value === 1099 ? 'flex-start' : '',
         }">
           <radio :value="item.value" :checked="item.checked" />
-          <text>{{ item.label }}</text>
+
-          <textarea v-if="item.value === 2099 || item.value === 1099" v-model="otherReason" class="other-input"
+          <view v-if="item.value === 2099 || item.value === 1099">
-            placeholder="请输入具体原因" :disabled="selectedChildrenReason !== selectedChildrenReason" />
+            <text style="display: block;margin-bottom: 16rpx;'">{{ item.label }}</text>
+            <textarea v-model="otherReason" class="other-input" placeholder="请输入具体原因"
+              :disabled="selectedChildrenReason !== selectedChildrenReason" />
+          </view>
+          <text v-else>{{ item.label }}</text>
         </label>
       </radio-group>
     </scroll-view>

pages/shopPages/settlement/components/commodityItem.vue

@@ -29,11 +29,11 @@
           obj.COMMODITY_UNIT
           }}</span>
         <view style="display: flex;flex-direction: column;align-items: flex-end;">
-          <span class="font_2" :style="{ textDecoration: obj.showDiscount ? 'line-through' : '' }">¥{{ obj.cartItemAoumt
+          <span class="font_2">¥{{ obj.cartItemAoumt
             }}</span>
-          <span class="font_2" v-if="obj.showDiscount">¥{{ preciseRound(
+          <!-- <span class="font_2" v-if="obj.showDiscount">¥{{ preciseRound(
             obj.discountedPrice * obj.count
-          ) }}</span>
+          ) }}</span> -->
         </view>
       </div>
       <div class="remark" v-if="isSubmit && obj.SALEDETAIL_DESC">

pages/shopPages/settlement/index.vue

@@ -106,9 +106,9 @@
           <div class="sum_count">
             合计<span class="unit">￥</span><span class="price">{{ couponOrder }}</span>
           </div>
-          <div class="discountAmount" v-if="discountAmount">
+          <!-- <div class="discountAmount" v-if="discountAmount">
             已减￥{{ discountAmount }}
-          </div>
+          </div> -->
         </div>
 
 
@@ -152,10 +152,10 @@
             <view class="addressItemBottom">
               <text class="bigName" style="margin-right: 8rpx">{{
                 item.USER_NAME || ""
-                }}</text>
+              }}</text>
               <text class="name" style="margin-right: 8rpx">{{
                 item.USER_SEX_TEXT || ""
-                }}</text>
+              }}</text>
               <text class="phone">{{ item.MOBILEPHONE || "" }}</text>
             </view>
           </view>
@@ -234,43 +234,43 @@ export default {
     couponOrder() {
       // 商品金额
       let amount = 0;
-      console.log('computedcomputed', this.shopOrder);
+      // console.log('computedcomputed', this.shopOrder);
 
       // 判断 活动模块  的商品是不是大于等于2个 那么 就是打95折  
-      let haveSum = 0
+      // let haveSum = 0
-      this.shopOrder.forEach((item) => {
+      // this.shopOrder.forEach((item) => {
-        let goodNum = Number(item.count);
+      //   let goodNum = Number(item.count);
-        if (item.showDiscount) {
+      //   // if (item.showDiscount) {
-          haveSum += 1 * goodNum
+      //   // haveSum += 1 * goodNum
-        }
+      //   // }
-      })
+      // })
 
-      if (haveSum >= 2) {
+      // if (haveSum >= 2) {
-        let discountedProducts = 0 // 打折商品的合计钱(还没乘0.95的)
+      //   let discountedProducts = 0 // 打折商品的合计钱(还没乘0.95的)
-        let noDiscountedProducts = 0
+      //   let noDiscountedProducts = 0
 
-        this.shopOrder.forEach((item) => {
+      //   this.shopOrder.forEach((item) => {
-          let goodNum = Number(item.count);
+      //     let goodNum = Number(item.count);
-          if (item.showDiscount) {
+      //     if (item.showDiscount) {
-            discountedProducts += item.COMMODITY_MEMBERPRICE * goodNum
+      //       discountedProducts += item.COMMODITY_MEMBERPRICE * goodNum
-          } else {
+      //     } else {
-            noDiscountedProducts += item.COMMODITY_MEMBERPRICE * goodNum
+      //       noDiscountedProducts += item.COMMODITY_MEMBERPRICE * goodNum
-          }
+      //     }
-        })
+      //   })
 
-        this.discountAmount = (discountedProducts - this.preciseRound(0.95 * discountedProducts)).toFixed(2)
+      //   this.discountAmount = (discountedProducts - this.preciseRound(0.95 * discountedProducts)).toFixed(2)
-        let res = (this.preciseRound(0.95 * discountedProducts) + noDiscountedProducts).toFixed(2)
+      //   let res = (this.preciseRound(0.95 * discountedProducts) + noDiscountedProducts).toFixed(2)
-        console.log('this.discountAmount this.discountAmount', this.discountAmount);
+      //   console.log('this.discountAmount this.discountAmount', this.discountAmount);
 
-        return res
+      //   return res
-      } else {
+      // } else {
-        // 正常算钱
+      // 正常算钱
-        this.shopOrder.map((v) => {
+      this.shopOrder.map((v) => {
-          amount += v.ORDER_AMOUNT;
+        amount += v.ORDER_AMOUNT;
-        });
+      });
-        this.discountAmount = 0
+      this.discountAmount = 0
-        return amount.toFixed(2);
+      return amount.toFixed(2);
-      }
+      // }
     },
   },
   onShow() {
@@ -805,7 +805,7 @@ export default {
                   title: "进行组合支付...",
                 });
 
-                if (_this.user.TEST_MEMBER) { 
+                if (_this.user.TEST_MEMBER) {
                   let _this = this
                   uni.showModal({
                     content: "此单是否为测试订单？",

pages/user/index.vue

@@ -161,7 +161,7 @@
             <image class="basicItemImg" src="https://eshangtech.com/caiyunyiImg/bindCarIcon.png" />
             <view class="basicText">绑定车辆</view>
           </view>
-<!-- @click="handleGoNormal({ value: 3 })" -->
+          <!-- @click="handleGoNormal({ value: 3 })" -->
           <!-- <view class="basicItem" >
             <image class="basicItemImg" src="https://eshangtech.com/caiyunyiImg/suggestionFeedbackIcon.png" />
             <view class="basicText">建议反馈</view>
@@ -283,7 +283,7 @@
             <view class="funItemText">我的爱车</view>
           </view>
           <!-- @click="handleGoNormal({ value: 3 })" -->
-          <view class="funItemBox" >
+          <view class="funItemBox">
             <image class="funItemImg" src="/static/images/home/suggestion.svg" />
             <view class="funItemText">建议反馈</view>
           </view>
@@ -424,14 +424,10 @@ export default {
       uni.navigateTo({ url: `/pages/register/index?backTo=index` });
     }
     this.menu = uni.getMenuButtonBoundingClientRect();
-    console.log('this.menuthis.menuthis.menu', this.menu);
 
     let height = uni.getStorageSync("safeHeight");
     this.safeHeight = Number(height);
 
-
-
-
     // 拿到新的缓存数据
     let userData = uni.getStorageSync('userData')
     if (userData) {
@@ -486,7 +482,6 @@ export default {
 
       let inShop = uni.getStorageSync("inShop");
       this.inShop = inShop
-      console.log('this.inShop', JSON.parse(JSON.stringify(this.inShop)));
 
       // 拿到订单的缓存数据
       let shopOrderStatus = uni.getStorageSync('shopOrderStatus')
@@ -516,7 +511,6 @@ export default {
         } else {
           shopCarList = this.$store.state.myShopCar;
         }
-        console.log("shopCarList", shopCarList);
         let count = 0;
         if (shopCarList && shopCarList.length > 0) {
           shopCarList.forEach((item) => {
@@ -533,19 +527,16 @@ export default {
         this.cards = userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : ""
         this.$forceUpdate()
       }
-      console.log('userDatauserDatauserData', userData);
-
       return;
     }
 
     let inShop = uni.getStorageSync("inShop");
     this.inShop = inShop
-    console.log('this.inShop', JSON.parse(JSON.stringify(this.inShop)));
-
 
     // 拿到订单的缓存数据
     let shopOrderStatus = uni.getStorageSync('shopOrderStatus')
     let foodOrderStatus = uni.getStorageSync('foodOrderStatus')
+    console.log('foodOrderStatusfoodOrderStatusfoodOrderStatus', foodOrderStatus);
 
     this.mallOrderCountList = shopOrderStatus ? shopOrderStatus : []
 
@@ -601,7 +592,6 @@ export default {
       } else {
         shopCarList = this.$store.state.myShopCar;
       }
-      console.log("shopCarList", shopCarList);
       let count = 0;
       if (shopCarList && shopCarList.length > 0) {
         shopCarList.forEach((item) => {
@@ -620,8 +610,6 @@ export default {
       this.cards = userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : ""
       this.$forceUpdate()
     }
-    console.log('userDatauserDatauserData', userData);
-
 
     await this.handleGetOrderDetail()
     // 拿用户信息
@@ -654,7 +642,6 @@ export default {
   },
   methods: {
     onContact(e) {
-      console.log('用户点击客服，回调detail：', e.detail);
       // e.detail.path / query 等可用于透传会话来源
     },
     // 下拉刷新处理
@@ -1052,7 +1039,6 @@ export default {
         .then(function (data) {
           if (data.ResultCode === "100") {
             let _data = data;
-            console.log("_data", _data);
             _this.userInfo = _data.Data
             _this.user.MEMBERSHIP_ID = _data.Data.MEMBERSHIP_ID || "";
             _this.user.MEMBERSHIP_NAME = _data.Data.MEMBERSHIP_NAME || "";
@@ -1152,7 +1138,6 @@ export default {
     },
     // 常用功能的跳转
     handleGoNormal(obj) {
-      console.log("obj", obj);
       if (obj.value === 1) {
         // 会员权益
         uni.navigateTo({
@@ -1195,7 +1180,6 @@ export default {
       };
 
       const data = await this.$api.$get("/WeChat/GenerateSign", reqSign);
-      console.log("data", data);
       wx.openOfflinePayView({
         appId: "wxee018fb96955552a",
         timeStamp: timeStamp,
@@ -1204,13 +1188,11 @@ export default {
         signType: "MD5",
         paySign: data.Result_Data,
         success(res) {
-          console.log("res", res);
         },
       });
     },
     // 最底下的两个点击事件
     handleLastFun(value) {
-      console.log("value", value);
       if (value === 1) {
         // 客服帮助
         // uni.navigateTo({
@@ -1222,7 +1204,6 @@ export default {
           }, // 客服信息
           corpId: "", //企业ID
           success(res) {
-            console.log("res", res);
           },
         });
       } else if (value === 2) {
@@ -1317,7 +1298,6 @@ export default {
         noLoading: true
       };
       const data = await this.$api.postCoop(req);
-      console.log('商城订单', data);
       if (data.ResultCode === "100") {
         let list = data.Data.List
         // 待付款
@@ -1326,8 +1306,6 @@ export default {
         let pendingShipment = []
         // 待收货
         let pendingReceiptOfGoods = []
-        console.log('listlistlist', list);
-
         if (list && list.length > 0) {
           list.forEach((item) => {
             if (item.SALEBILL_STATE === 1005) {
@@ -1362,7 +1340,6 @@ export default {
         noLoading: true
       };
       const dataFood = await this.$api.postCoop(reqFood);
-      console.log('点餐订单', dataFood);
       if (dataFood.ResultCode === "100") {
         let list = dataFood.Data.List
         // 待付款

unpackage/dist/dev/mp-weixin/pages/evaluateList/components/orderItem.json

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

unpackage/dist/dev/mp-weixin/pages/order/orderdetail/index.wxss

@@ -78,6 +78,16 @@ page.data-v-8f520710 {
   border-radius: 12rpx;
   box-sizing: border-box;
 }
+.qrCodeBox.data-v-8f520710 {
+  width: calc(100vw - 48rpx);
+  height: 500rpx;
+  background-color: #fff;
+  box-sizing: border-box;
+  padding: 0 24rpx;
+  margin-left: 24rpx;
+  border-radius: 16rpx;
+  margin-bottom: 20rpx;
+}
 .pageDesc.data-v-8f520710 {
   width: 100%;
   text-align: left;
@@ -92,10 +102,9 @@ page.data-v-8f520710 {
   justify-content: space-between;
   align-items: center;
   font-size: 30rpx;
-  border-bottom: 1rpx solid #f5f5f5;
+  border-bottom: 1rpx solid #e6e6e6;
-  height: 100rpx;
+  padding: 16rpx 0;
   box-sizing: border-box;
-  margin-bottom: 24rpx;
 }
 .coupon.data-v-8f520710 {
   padding: 20rpx 0;

unpackage/dist/dev/mp-weixin/pages/shopPages/settlement/components/commodityItem.js

@@ -86,9 +86,6 @@ var render = function () {
     : null
   var g1 = _vm.obj.IMAGE_PATH && g0 ? _vm.obj.IMAGE_PATH.split(",") : null
   var g2 = !_vm.obj.IMAGE_PATH ? _vm.obj.List && _vm.obj.List.length > 0 : null
-  var m0 = _vm.obj.showDiscount
-    ? _vm.preciseRound(_vm.obj.discountedPrice * _vm.obj.count)
-    : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -96,7 +93,6 @@ var render = function () {
         g0: g0,
         g1: g1,
         g2: g2,
-        m0: m0,
       },
     }
   )

unpackage/dist/dev/mp-weixin/pages/shopPages/settlement/components/commodityItem.wxml

@@ -1 +1 @@
-<view class="flex-row space-x-12 _div data-v-5a6f0e03"><image class="shrink-0 self-start image_9 _img data-v-5a6f0e03" src="{{obj.IMAGE_PATH?$root.g0?$root.g1[0]:obj.IMAGE_PATH:$root.g2?obj.List[0].IMAGE_URL:obj.DEFAULT_IMG?obj.DEFAULT_IMG:'/static/images/home/defultImg.png'}}"></image><view class="flex-col info _div data-v-5a6f0e03"><view class="flex-row justify-between _div data-v-5a6f0e03"><block wx:if="{{obj.bracketContent}}"><view class="font_3 titleName _div data-v-5a6f0e03"><label style="font-weight:600;color:red;" class="_span data-v-5a6f0e03">{{''+(obj.COMMODITY_RULE?'（'+obj.COMMODITY_RULE+'）':"")+obj.bracketContent}}</label><label class="_span data-v-5a6f0e03">{{obj.restContent||""}}</label></view></block><block wx:else><view class="font_3 titleName _div data-v-5a6f0e03">{{(obj.COMMODITY_RULE?'（'+obj.COMMODITY_RULE+'）':"")+(obj.COMMODITY_NAME||"")}}</view></block><view class="font_3 _div data-v-5a6f0e03" style="width:100px;text-align:right;">{{'x'+obj.count+obj.COMMODITY_UNIT+''}}</view></view><view class="flex-row justify-between _div data-v-5a6f0e03"><label class="font_2 _span data-v-5a6f0e03">{{"单价: "+obj.COMMODITY_MEMBERPRICE+"元/"+obj.COMMODITY_UNIT}}</label><view style="display:flex;flex-direction:column;align-items:flex-end;" class="data-v-5a6f0e03"><label class="font_2 _span data-v-5a6f0e03" style="{{'text-decoration:'+(obj.showDiscount?'line-through':'')+';'}}">{{"¥"+obj.cartItemAoumt}}</label><block wx:if="{{obj.showDiscount}}"><label class="font_2 _span data-v-5a6f0e03">{{"¥"+$root.m0}}</label></block></view></view><block wx:if="{{isSubmit&&obj.SALEDETAIL_DESC}}"><view class="remark _div data-v-5a6f0e03"><input class="input data-v-5a6f0e03" disabled="{{isSubmit}}" data-event-opts="{{[['input',[['__set_model',['$0','SALEDETAIL_DESC','$event',[]],['obj']]]]]}}" value="{{obj.SALEDETAIL_DESC}}" bindinput="__e"/></view></block><block wx:if="{{!isSubmit}}"><view class="remark _div data-v-5a6f0e03"><input class="input data-v-5a6f0e03" placeholder="这里是备注的内容" data-event-opts="{{[['blur',[['handleChangeValue',['$event','$0'],['obj']]]]]}}" value="{{obj.SALEDETAIL_DESC}}" bindblur="__e"/></view></block></view></view>
+<view class="flex-row space-x-12 _div data-v-5a6f0e03"><image class="shrink-0 self-start image_9 _img data-v-5a6f0e03" src="{{obj.IMAGE_PATH?$root.g0?$root.g1[0]:obj.IMAGE_PATH:$root.g2?obj.List[0].IMAGE_URL:obj.DEFAULT_IMG?obj.DEFAULT_IMG:'/static/images/home/defultImg.png'}}"></image><view class="flex-col info _div data-v-5a6f0e03"><view class="flex-row justify-between _div data-v-5a6f0e03"><block wx:if="{{obj.bracketContent}}"><view class="font_3 titleName _div data-v-5a6f0e03"><label style="font-weight:600;color:red;" class="_span data-v-5a6f0e03">{{''+(obj.COMMODITY_RULE?'（'+obj.COMMODITY_RULE+'）':"")+obj.bracketContent}}</label><label class="_span data-v-5a6f0e03">{{obj.restContent||""}}</label></view></block><block wx:else><view class="font_3 titleName _div data-v-5a6f0e03">{{(obj.COMMODITY_RULE?'（'+obj.COMMODITY_RULE+'）':"")+(obj.COMMODITY_NAME||"")}}</view></block><view class="font_3 _div data-v-5a6f0e03" style="width:100px;text-align:right;">{{'x'+obj.count+obj.COMMODITY_UNIT+''}}</view></view><view class="flex-row justify-between _div data-v-5a6f0e03"><label class="font_2 _span data-v-5a6f0e03">{{"单价: "+obj.COMMODITY_MEMBERPRICE+"元/"+obj.COMMODITY_UNIT}}</label><view style="display:flex;flex-direction:column;align-items:flex-end;" class="data-v-5a6f0e03"><label class="font_2 _span data-v-5a6f0e03">{{"¥"+obj.cartItemAoumt}}</label></view></view><block wx:if="{{isSubmit&&obj.SALEDETAIL_DESC}}"><view class="remark _div data-v-5a6f0e03"><input class="input data-v-5a6f0e03" disabled="{{isSubmit}}" data-event-opts="{{[['input',[['__set_model',['$0','SALEDETAIL_DESC','$event',[]],['obj']]]]]}}" value="{{obj.SALEDETAIL_DESC}}" bindinput="__e"/></view></block><block wx:if="{{!isSubmit}}"><view class="remark _div data-v-5a6f0e03"><input class="input data-v-5a6f0e03" placeholder="这里是备注的内容" data-event-opts="{{[['blur',[['handleChangeValue',['$event','$0'],['obj']]]]]}}" value="{{obj.SALEDETAIL_DESC}}" bindblur="__e"/></view></block></view></view>

unpackage/dist/dev/mp-weixin/pages/shopPages/settlement/index.js

@@ -294,39 +294,43 @@ var _default = {
     couponOrder: function couponOrder() {
       // 商品金额
       var amount = 0;
-      console.log('computedcomputed', this.shopOrder);
+      // console.log('computedcomputed', this.shopOrder);
 
       // 判断 活动模块  的商品是不是大于等于2个 那么 就是打95折  
-      var haveSum = 0;
+      // let haveSum = 0
-      this.shopOrder.forEach(function (item) {
+      // this.shopOrder.forEach((item) => {
-        var goodNum = Number(item.count);
+      //   let goodNum = Number(item.count);
-        if (item.showDiscount) {
+      //   // if (item.showDiscount) {
-          haveSum += 1 * goodNum;
+      //   // haveSum += 1 * goodNum
-        }
+      //   // }
+      // })
+
+      // if (haveSum >= 2) {
+      //   let discountedProducts = 0 // 打折商品的合计钱(还没乘0.95的)
+      //   let noDiscountedProducts = 0
+
+      //   this.shopOrder.forEach((item) => {
+      //     let goodNum = Number(item.count);
+      //     if (item.showDiscount) {
+      //       discountedProducts += item.COMMODITY_MEMBERPRICE * goodNum
+      //     } else {
+      //       noDiscountedProducts += item.COMMODITY_MEMBERPRICE * goodNum
+      //     }
+      //   })
+
+      //   this.discountAmount = (discountedProducts - this.preciseRound(0.95 * discountedProducts)).toFixed(2)
+      //   let res = (this.preciseRound(0.95 * discountedProducts) + noDiscountedProducts).toFixed(2)
+      //   console.log('this.discountAmount this.discountAmount', this.discountAmount);
+
+      //   return res
+      // } else {
+      // 正常算钱
+      this.shopOrder.map(function (v) {
+        amount += v.ORDER_AMOUNT;
       });
-      if (haveSum >= 2) {
+      this.discountAmount = 0;
-        var discountedProducts = 0; // 打折商品的合计钱(还没乘0.95的)
+      return amount.toFixed(2);
-        var noDiscountedProducts = 0;
+      // }
-        this.shopOrder.forEach(function (item) {
-          var goodNum = Number(item.count);
-          if (item.showDiscount) {
-            discountedProducts += item.COMMODITY_MEMBERPRICE * goodNum;
-          } else {
-            noDiscountedProducts += item.COMMODITY_MEMBERPRICE * goodNum;
-          }
-        });
-        this.discountAmount = (discountedProducts - this.preciseRound(0.95 * discountedProducts)).toFixed(2);
-        var res = (this.preciseRound(0.95 * discountedProducts) + noDiscountedProducts).toFixed(2);
-        console.log('this.discountAmount this.discountAmount', this.discountAmount);
-        return res;
-      } else {
-        // 正常算钱
-        this.shopOrder.map(function (v) {
-          amount += v.ORDER_AMOUNT;
-        });
-        this.discountAmount = 0;
-        return amount.toFixed(2);
-      }
     }
   }),
   onShow: function onShow() {

unpackage/dist/dev/mp-weixin/pages/user/index.js

@@ -283,7 +283,6 @@ var _default = {
                 });
               }
               _this2.menu = uni.getMenuButtonBoundingClientRect();
-              console.log('this.menuthis.menuthis.menu', _this2.menu);
               height = uni.getStorageSync("safeHeight");
               _this2.safeHeight = Number(height);
 
@@ -294,12 +293,12 @@ var _default = {
                 _this2.cards = userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : "";
               }
               // 拿用户信息
-              _context2.next = 12;
+              _context2.next = 11;
               return _this2.handleGetUserDetail();
-            case 12:
+            case 11:
-              _context2.next = 14;
+              _context2.next = 13;
               return _this2.handleGetOrderDetail();
-            case 14:
+            case 13:
               // }
 
               // 拿到订单信息
@@ -338,7 +337,7 @@ var _default = {
               _this2.$utils.addUserBehaviorNew({
                 behaviorRecordDesc: "进入了我的页面"
               });
-            case 16:
+            case 15:
             case "end":
               return _context2.stop();
           }
@@ -362,13 +361,12 @@ var _default = {
 
               // 跳过第一次onShow（因为onLoad已经加载过数据了）
               if (!_this3.isFirstShow) {
-                _context3.next = 15;
+                _context3.next = 13;
                 break;
               }
               _this3.isFirstShow = false;
               _inShop = uni.getStorageSync("inShop");
               _this3.inShop = _inShop;
-              console.log('this.inShop', JSON.parse(JSON.stringify(_this3.inShop)));
 
               // 拿到订单的缓存数据
               _shopOrderStatus = uni.getStorageSync('shopOrderStatus');
@@ -395,7 +393,6 @@ var _default = {
                 } else {
                   shopCarList = _this3.$store.state.myShopCar;
                 }
-                console.log("shopCarList", shopCarList);
                 count = 0;
                 if (shopCarList && shopCarList.length > 0) {
                   shopCarList.forEach(function (item) {
@@ -412,16 +409,15 @@ var _default = {
                 _this3.cards = _userData.LicencePlate.List && _userData.LicencePlate.List.length > 0 ? _userData.LicencePlate.List[0].License_Plate : "";
                 _this3.$forceUpdate();
               }
-              console.log('userDatauserDatauserData', _userData);
               return _context3.abrupt("return");
-            case 15:
+            case 13:
               inShop = uni.getStorageSync("inShop");
               _this3.inShop = inShop;
-              console.log('this.inShop', JSON.parse(JSON.stringify(_this3.inShop)));
 
               // 拿到订单的缓存数据
               shopOrderStatus = uni.getStorageSync('shopOrderStatus');
               foodOrderStatus = uni.getStorageSync('foodOrderStatus');
+              console.log('foodOrderStatusfoodOrderStatusfoodOrderStatus', foodOrderStatus);
               _this3.mallOrderCountList = shopOrderStatus ? shopOrderStatus : [];
               if (foodOrderStatus && foodOrderStatus.length > 0) {
                 _foodTab = JSON.parse(JSON.stringify(_this3.foodFunList));
@@ -473,7 +469,6 @@ var _default = {
                 } else {
                   _shopCarList = _this3.$store.state.myShopCar;
                 }
-                console.log("shopCarList", _shopCarList);
                 _count = 0;
                 if (_shopCarList && _shopCarList.length > 0) {
                   _shopCarList.forEach(function (item) {
@@ -490,15 +485,14 @@ var _default = {
                 _this3.cards = userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : "";
                 _this3.$forceUpdate();
               }
-              console.log('userDatauserDatauserData', userData);
+              _context3.next = 25;
-              _context3.next = 28;
               return _this3.handleGetOrderDetail();
-            case 28:
+            case 25:
-              _context3.next = 30;
+              _context3.next = 27;
               return _this3.handleGetUserDetail();
-            case 30:
+            case 27:
               _this3.$forceUpdate();
-            case 31:
+            case 28:
             case "end":
               return _context3.stop();
           }
@@ -529,7 +523,6 @@ var _default = {
   },
   methods: {
     onContact: function onContact(e) {
-      console.log('用户点击客服，回调detail：', e.detail);
       // e.detail.path / query 等可用于透传会话来源
     },
     // 下拉刷新处理
@@ -1042,7 +1035,6 @@ var _default = {
                 }).then(function (data) {
                   if (data.ResultCode === "100") {
                     var _data = data;
-                    console.log("_data", _data);
                     _this.userInfo = _data.Data;
                     _this.user.MEMBERSHIP_ID = _data.Data.MEMBERSHIP_ID || "";
                     _this.user.MEMBERSHIP_NAME = _data.Data.MEMBERSHIP_NAME || "";
@@ -1172,7 +1164,6 @@ var _default = {
     },
     // 常用功能的跳转
     handleGoNormal: function handleGoNormal(obj) {
-      console.log("obj", obj);
       if (obj.value === 1) {
         // 会员权益
         uni.navigateTo({
@@ -1224,7 +1215,6 @@ var _default = {
                 return _this11.$api.$get("/WeChat/GenerateSign", reqSign);
               case 6:
                 data = _context11.sent;
-                console.log("data", data);
                 wx.openOfflinePayView({
                   appId: "wxee018fb96955552a",
                   timeStamp: timeStamp,
@@ -1232,11 +1222,9 @@ var _default = {
                   package: "1672298991",
                   signType: "MD5",
                   paySign: data.Result_Data,
-                  success: function success(res) {
+                  success: function success(res) {}
-                    console.log("res", res);
-                  }
                 });
-              case 9:
+              case 8:
               case "end":
                 return _context11.stop();
             }
@@ -1246,7 +1234,6 @@ var _default = {
     },
     // 最底下的两个点击事件
     handleLastFun: function handleLastFun(value) {
-      console.log("value", value);
       if (value === 1) {
         // 客服帮助
         // uni.navigateTo({
@@ -1260,9 +1247,7 @@ var _default = {
           // 客服信息
           corpId: "",
           //企业ID
-          success: function success(res) {
+          success: function success(res) {}
-            console.log("res", res);
-          }
         });
       } else if (value === 2) {
         // 服务热线
@@ -1375,13 +1360,11 @@ var _default = {
                 return _this12.$api.postCoop(req);
               case 5:
                 data = _context12.sent;
-                console.log('商城订单', data);
                 if (data.ResultCode === "100") {
                   list = data.Data.List; // 待付款
                   obligation = []; // 待发货
                   pendingShipment = []; // 待收货
                   pendingReceiptOfGoods = [];
-                  console.log('listlistlist', list);
                   if (list && list.length > 0) {
                     list.forEach(function (item) {
                       if (item.SALEBILL_STATE === 1005) {
@@ -1410,11 +1393,10 @@ var _default = {
                   requestType: "application/x-www-form-urlencoded",
                   noLoading: true
                 };
-                _context12.next = 13;
+                _context12.next = 12;
                 return _this12.$api.postCoop(reqFood);
-              case 13:
+              case 12:
                 dataFood = _context12.sent;
-                console.log('点餐订单', dataFood);
                 if (dataFood.ResultCode === "100") {
                   _list = dataFood.Data.List; // 待付款
                   _obligation = []; // 待接单
@@ -1464,7 +1446,7 @@ var _default = {
                   }];
                 }
                 _this12.$forceUpdate();
-              case 17:
+              case 15:
               case "end":
                 return _context12.stop();
             }

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -8,6 +8,20 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/order/orderdetail/index",
+          "pathName": "pages/order/orderdetail/index",
+          "query": "orderInternal=131809",
+          "scene": null,
+          "launchMode": "default"
+        },
+        {
+          "name": "pages/order/orderdetail/index",
+          "pathName": "pages/order/orderdetail/index",
+          "query": "sellchildid=131784&orderInternal=131782&orderStatus=1010&SUPPLIER_NAME=undefined",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/shopMallPage/shopCar/index",
           "pathName": "pages/shopMallPage/shopCar/index",