update

pages/index/index.vue

@@ -157,7 +157,7 @@
       </view>
 
       <!-- 附近的景区 -->
-      <view class="nearbyScenic">
+      <view class="nearbyScenic" v-if="false">
         <view class="nearbyScenicTop">
           <view class="nearbyScenicTopTitle">附近景区</view>
           <view class="nearbyScenicTopRightBox" @click="handleGoScenicList">
@@ -751,7 +751,8 @@ export default {
       let req = {
         SearchParameter: {
           OWNERUNIT_ID: 911,
-          GOODSTYPE: 7000
+          GOODSTYPE: 7000,
+          USERDEFINEDTYPE_STATE: 1
         },
         SortStr: "OPERATE_DATE desc",
         type: 'encryption'
@@ -764,7 +765,8 @@ export default {
       let req2 = {
         SearchParameter: {
           OWNERUNIT_ID: 911,
-          GOODSTYPE: 7001
+          GOODSTYPE: 7001,
+          USERDEFINEDTYPE_STATE: 1
         },
         SortStr: "OPERATE_DATE desc",
         type: 'encryption'
@@ -778,8 +780,45 @@ export default {
       console.log('datadatadatadatadatadatadatadatadata', data2);
       let res1 = data1.Result_Data.List
       let res2 = data2.Result_Data.List
-      this.swiperList.unshift(res1[0].USERDEFINEDTYPE_ICO)
+
-      this.poster = res2[0]
+      // 修改一下 使用的是 当前时间在的范围内的第一个
+      let firstObj1 = {}
+      if (res1 && res1.length > 0) {
+        for (let i = 0; i < res1.length; i++) {
+          const item = res1[i];
+          if (
+            new Date(item.PRESALE_STARTTIME).getTime() < new Date().getTime() &&
+            new Date().getTime() < new Date(item.PRESALE_ENDTIME).getTime()
+          ) {
+            firstObj1 = item;
+            break; // 找到第一条后立即跳出循环
+          }
+        }
+      }
+
+      let firstObj2 = {}
+      if (res2 && res2.length > 0) {
+        for (let i = 0; i < res2.length; i++) {
+          const item = res2[i];
+          if (
+            new Date(item.PRESALE_STARTTIME).getTime() < new Date().getTime() &&
+            new Date().getTime() < new Date(item.PRESALE_ENDTIME).getTime()
+          ) {
+            firstObj2 = item;
+            break; // 找到第一条后立即跳出循环
+          }
+        }
+      }
+
+      console.log('firstObj1', firstObj1);
+      console.log('firstObj2', firstObj2);
+
+
+      this.swiperList.unshift(firstObj1.USERDEFINEDTYPE_ICO)
+      this.poster = firstObj2
+
+      // this.swiperList.unshift(res1[0].USERDEFINEDTYPE_ICO)
+      // this.poster = res2[0]
 
     },
     // 测试加密的方法

pages/order/buyOrder/index.vue

@@ -62,7 +62,7 @@
           <span class="orderItemMoney">¥{{ item.PAY_AMOUNT || "" }}</span>
         </view>
 
-        <view class="orderItemBottom">
+        <view class="orderItemBottom" v-if="false">
           <view class="orderItemBottomLeft">
             <view class="orderItemBottomLeftMore">更多</view>
           </view>

pages/order/orderFoodDetail/index.vue

@@ -78,6 +78,9 @@
         <p class="order-info-type">
           <span class="order-info-t">预约电话</span><span>{{ orderInfo.ORDER_PERSONTEL }}</span>
         </p>
+        <p class="order-info-type">
+          <span class="order-info-t">订单备注</span><span>{{ orderInfo.SALEBILL_DESC }}</span>
+        </p>
       </block>
     </div>
 
@@ -96,6 +99,7 @@
       </div>
 
       <div class="order-list" v-for="(item, i) in shopOrder" :key="i">
+        <div style="display: flex;">
           <div class="order-name">
             {{
               item.COMMODITY_RULE
@@ -106,6 +110,10 @@
           <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 />
 
@@ -869,7 +877,6 @@ page {
   margin-bottom: 24rpx;
 }
 
-.order-list,
 .coupon {
   padding: 20rpx 0;
   box-sizing: border-box;
@@ -878,6 +885,14 @@ page {
   color: #000000;
 }
 
+.order-list {
+  padding: 20rpx 0;
+  box-sizing: border-box;
+  background-color: #fff;
+  // display: flex;
+  color: #000000;
+}
+
 .order-name {
   font-size: 26rpx;
   flex: 0.7;

pages/order/orderdetail/index.vue

@@ -111,6 +111,9 @@
         <p class="order-info-type" v-if="orderInfo.TOTAL_PAY">
           <span class="order-info-t">微信支付</span><span>￥{{ orderInfo.TOTAL_PAY }}</span>
         </p>
+        <p class="order-info-type">
+          <span class="order-info-t">订单备注</span><span>{{ orderInfo.SALEBILL_DESC }}</span>
+        </p>
       </block>
     </div>
 
@@ -129,6 +132,7 @@
       </div>
 
       <div class="order-list" v-for="(item, i) in shopOrder" :key="i">
+        <div style="display: flex;">
           <div class="order-name">
             {{
               item.COMMODITY_RULE
@@ -139,6 +143,11 @@
           <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 />
 
@@ -1016,7 +1025,6 @@ page {
   margin-bottom: 24rpx;
 }
 
-.order-list,
 .coupon {
   padding: 20rpx 0;
   box-sizing: border-box;
@@ -1025,6 +1033,14 @@ page {
   color: #000000;
 }
 
+.order-list {
+  padding: 20rpx 0;
+  box-sizing: border-box;
+  background-color: #fff;
+  // display: flex;
+  color: #000000;
+}
+
 .order-name {
   font-size: 26rpx;
   flex: 0.7;

pages/payfor/index.vue

@@ -11,8 +11,7 @@
       <!-- <h3 class="text-title">会员积分码</h3> -->
 
       <div class="userImgBox">
-        <div
+        <div style="
-          style="
             width: 100%;
             height: 100%;
             display: flex;
@@ -20,37 +19,25 @@
             align-items: center;
             background: #eaecee;
             border-radius: 50%;
-          "
+          ">
-        >
+          <image style="width: 100%; height: 100%" :src="WXProfile || user.MEMBERSHIP_HEADIMAGEURL" />
-          <image
-            style="width: 40%; height: 40%"
-            src="/static/images/home/defaultUser.png"
-          />
         </div>
       </div>
 
       <div v-if="checkPay">
         <div style="position: relative; text-align: center">
           <div v-if="!barcodeImg">
-            <canvas
+            <canvas canvas-id="barcode" style="height: 120rpx; width: 480rpx; margin: 0 0 14rpx 0" />
-              canvas-id="barcode"
-              style="height: 120rpx; width: 480rpx; margin: 0 0 14rpx 0"
-            />
           </div>
 
-          <image
+          <image v-if="barcodeImg" style="height: 120rpx; width: 480rpx; margin: 0 0 14rpx 0" :src="barcodeImg" />
-            v-if="barcodeImg"
-            style="height: 120rpx; width: 480rpx; margin: 0 0 14rpx 0"
-            :src="barcodeImg"
-          />
         </div>
         <view class="code-box">
           <text class="code-text">{{
             isShowAllCode ? allCode : showCode
           }}</text>
 
-          <text class="text-blue" @tap="isShowAllCode = !isShowAllCode"
+          <text class="text-blue" @tap="isShowAllCode = !isShowAllCode">{{ isShowAllCode ? "关闭查看" : "查看数字" }}
-            >{{ isShowAllCode ? "关闭查看" : "查看数字" }}
           </text>
         </view>
 
@@ -59,50 +46,27 @@
             <canvas canvas-id="qrcode" style="height: 360rpx; width: 360rpx" />
           </div>
 
-          <image
+          <image v-if="qrcodeImg" style="height: 360rpx; width: 360rpx" :src="qrcodeImg" />
-            v-if="qrcodeImg"
-            style="height: 360rpx; width: 360rpx"
-            :src="qrcodeImg"
-          />
         </div>
         <div class="refresh-box flex align-center" @click.stop="refreshCode()">
-          <van-icon
+          <van-icon name="replay" size="30rpx" color="#ff6666" custom-style="margin-right:8rpx;" />
-            name="replay"
-            size="30rpx"
-            color="#ff6666"
-            custom-style="margin-right:8rpx;"
-          />
           <span class="text-xs color9d">每分钟自动刷新</span>
         </div>
-        <div
+        <div class="flex justify-between coupon-box align-center" @tap="isShow = true">
-          class="flex justify-between coupon-box align-center"
-          @tap="isShow = true"
-        >
           <div class="flex align-center">
             <div class="flex align-center">
-              <image
+              <image src="/static/images/home/couponIcon.png" class="coupon-ico"></image>
-                src="/static/images/home/couponIcon.png"
-                class="coupon-ico"
-              ></image>
               <view class="text-39">优惠券</view>
             </div>
           </div>
-          <div
+          <div @click="handleSelectCoupon" style="display: flex; align-items: center">
-            @click="handleSelectCoupon"
+            <text class="text-sm color9d" v-if="couponlist.length == 0">暂无可使用的优惠券</text>
-            style="display: flex; align-items: center"
-          >
-            <text class="text-sm color9d" v-if="couponlist.length == 0"
-              >暂无可使用的优惠券</text
-            >
             <text class="text-sm color9d" v-else>{{
               cid && choeseCouponIndex != null
                 ? couponlist[choeseCouponIndex].CouponName
                 : "选择要使用的优惠券"
             }}</text>
-            <image
+            <image style="width: 24rpx; height: 24rpx" src="/static/images/home/rightArrowIcon.png" />
-              style="width: 24rpx; height: 24rpx"
-              src="/static/images/home/rightArrowIcon.png"
-            />
           </div>
         </div>
       </div>
@@ -110,8 +74,7 @@
         <p class="pay-end">支付成功</p>
         <p class="pay-door">{{ payDoor }}</p>
         <div class="pay-price">
-          <span>{{ payPrice }}</span
+          <span>{{ payPrice }}</span>元
-          >元
         </div>
         <div class="pay-btn" @tap="payEnd">完成</div>
       </div>
@@ -127,10 +90,7 @@
         <view class="shipList">
           <view class="shipItem" @click="handleRealGoPay(1)">
             <view class="shipIconBox">
-              <image
+              <image class="shipIcon" src="/static/images/home/alipayIcon.png" />
-                class="shipIcon"
-                src="/static/images/home/alipayIcon.png"
-              />
             </view>
             <!-- <span class="shipTitle">支付宝</span> -->
           </view>
@@ -144,35 +104,19 @@
       </view>
     </view>
 
-    <UniPopup
+    <UniPopup ref="popup" closeable position="bottom" :show="isShow" custom-style="height: 760rpx;" :safe-area="false">
-      ref="popup"
-      closeable
-      position="bottom"
-      :show="isShow"
-      custom-style="height: 760rpx;"
-      :safe-area="false"
-    >
       <view class="couponPopup">
         <view class="body-title"> 选择优惠券 </view>
 
         <view class="pop-body">
           <scroll-view scroll-y style="height: 680rpx">
-            <view
+            <view class="couponItem" v-for="(item, i) in couponlist" :key="i" @tap="selectCoupon" :data-key="i">
-              class="couponItem"
-              v-for="(item, i) in couponlist"
-              :key="i"
-              @tap="selectCoupon"
-              :data-key="i"
-            >
               <div class="itemleft">
                 <div>
                   <span class="leftUnit">¥</span>
                   <span class="money">{{ item.UseAmount }}</span>
                 </div>
-                <div
+                <div v-if="!item.CouponSendId && item.CouponPoint" class="condition">
-                  v-if="!item.CouponSendId && item.CouponPoint"
-                  class="condition"
-                >
                   {{ item.CouponPoint }}积分兑换
                 </div>
                 <div v-else class="condition">
@@ -187,12 +131,8 @@
                 <div>
                   <div class="couponName">{{ item.CouponName }}</div>
                   <div class="timeText">
-                    <span class="coupon-date" v-if="item.CouponSendId"
+                    <span class="coupon-date" v-if="item.CouponSendId">有效期至{{ item.EndTime }}</span>
-                      >有效期至{{ item.EndTime }}</span
+                    <span class="coupon-date" v-else>活动至{{ item.EndTime }}</span>
-                    >
-                    <span class="coupon-date" v-else
-                      >活动至{{ item.EndTime }}</span
-                    >
                   </div>
                 </div>
               </div>
@@ -229,10 +169,13 @@ export default {
       loginType: "",
       barcodeImg: "", // 条码转的图片路径
       qrcodeImg: "", // 二维码图片转的路径
+      isLoading: false,
+      WXProfile: "",
+      user: {}
     };
   },
   computed: {
-    ...mapGetters(["user"]),
+    // ...mapGetters(["user"]),
 
     barcodeHeight() {
       return (120 / 750) * uni.getSystemInfoSync().windowWidth;
@@ -248,6 +191,56 @@ export default {
     UniPopup,
   },
   methods: {
+    // 拿用户最新的user信息
+    async handleGetUserInfo() {
+      let _this = this;
+      let vuex = uni.getStorageSync('vuex')
+      let vuexObj = {}
+      if (vuex) {
+        vuexObj = JSON.parse(vuex)
+        console.log('vuexObjvuexObjvuexObj', JSON.parse(JSON.stringify(vuexObj)));
+      }
+
+      const data = await _this.$api
+        .getCoop({
+          action_type: "GetMembershipInfo",
+          // WechatUserId: _this.user.WechatUserId,
+          WechatUserId: vuexObj.user.WechatUserId,
+        })
+
+      // .then(function (data) {
+      if (data.ResultCode === "100") {
+        let _data = data;
+        _this.user.MEMBERSHIP_ID = _data.Data.MEMBERSHIP_ID || "";
+        _this.user.WechatUserId = _data.Data.WechatUserId || "";
+        _this.user.MEMBERSHIP_NAME = _data.Data.MEMBERSHIP_NAME || "";
+        _this.user.MEMBERSHIP_LEVEL_TEXT =
+          _data.Data.MEMBERSHIP_LEVEL_TEXT || "";
+        _this.user.COUPON_COUNT = _data.Data.COUPON_COUNT || "";
+        _this.user.PENDORDER_COUNT = _data.Data.PENDORDER_COUNT || "";
+        _this.user.RESERVATION_COUNT = _data.Data.RESERVATION_COUNT || "";
+        _this.user.ACCOUNT_BALANCE = _data.Data.ACCOUNT_BALANCE || "";
+        _this.user.ISPLUS = _data.Data.ISPLUS || "";
+        _this.user.INDUSTRY_MEMBERSHIP_ID =
+          _data.Data.INDUSTRY_MEMBERSHIP_ID || "";
+        _this.user.MEMBERSHIP_TYPE = _data.Data.MEMBERSHIP_TYPE || "";
+        _this.user.MEMBERSHIP_LEVEL = _data.Data.MEMBERSHIP_LEVEL || "";
+        _this.user.InviteCode = _data.Data.InviteCode || "";
+        _this.user.MEMBERSHIP_POINT = _data.Data.MEMBERSHIP_POINT || "";
+        _this.user.MEMBERSHIP_MOBILEPHONE =
+          _data.Data.MEMBERSHIP_MOBILEPHONE || "";
+        _this.WXProfile = _data.Data.MEMBERSHIP_HEADIMAGEURL;
+        // _this.setUser(user);
+        _this.$store.commit("setUser", _this.user);
+
+        _this.$forceUpdate()
+        _this.showAvatar = true
+      } else {
+        // _this.setUser({});
+        // _this.$store.commit("setUser", user);
+      }
+      // });
+    },
     // 快捷支付
     handleRealGoPay(payType) {
       if (this.loginType === "android") {
@@ -317,6 +310,7 @@ export default {
       //   _this.$utils.qrc('qrcode2', code, _this.qrcodeHeight2, _this.qrcodeHeight2, null, '../../../static/images/gsuyiw.png')
       _this.showCode = code.substring(0, 4) + " " + "*".repeat("6");
 
+      setTimeout(() => {
         wx.canvasToTempFilePath({
           canvasId: "barcode",
           success: (res) => {
@@ -339,6 +333,7 @@ export default {
             _this.$forceUpdate();
           },
         });
+      }, 300)
       
       _this.$forceUpdate();
       _this.timer = setInterval(function () {
@@ -384,12 +379,19 @@ export default {
     // },
     getCode() {
       let _this = this;
+
+      this.isLoading = true;
+      if (!_this.user.MEMBERSHIP_ID) {
+        return;
+      }
+
       this.barcodeImg = "";
       this.qrcodeImg = "";
       this.$api
         // .$get("/WeChat/GetMemberECode", { couponCode: this.cid || "" })
         .$get("/WeChat/GetMemberECode", {
           membershipId: _this.user.MEMBERSHIP_ID || "",
+          couponCode: this.cid || "",
         })
         .then((res) => {
           console.log("resdsadasd", res);
@@ -397,6 +399,7 @@ export default {
             _this.allCode = res.Result_Data.Membership_ECode;
             _this.paintCode(res.Result_Data.Membership_ECode);
           }
+          _this.isLoading = false;
         });
     },
     getCouponLsit() {
@@ -439,7 +442,7 @@ export default {
     //   _this.payMent()
     // }, 5000)
   },
-  onLoad(option) {
+  async onLoad(option) {
     let type = uni.getStorageSync("loginType");
     this.loginType = type;
     console.log("option", option);
@@ -449,6 +452,9 @@ export default {
       this.cid = "";
       this.choeseCouponIndex = null;
     }
+
+    await this.handleGetUserInfo()
+
     this.getCouponLsit();
     this.getCode();
     this.$utils.addUserBehaviorNew();

pages/register/index.vue

@@ -11,7 +11,8 @@
         您点击“立即授权”，即代表您已经阅读并同意更新后的<text class="tips" @click="handleOpenPrivacyContract">《彩云驿出行隐私保护指引》</text>条款。
       </view>
       <view class="imgbox">
-        <image class="img" src="/static/images/home/registerIcon.png" />
+        <!-- <image class="img" src="/static/images/home/registerIcon.png" /> -->
+        <image class="img" src="https://eshangtech.com/caiyunyiImg/registerIcon.png" />
       </view>
 
       <div class="desc newBtnFixed" v-if="!user.MEMBERSHIP_ID">

pages/reservationOrder/index.vue

@@ -312,12 +312,12 @@ export default {
       if (this.user.MEMBERSHIP_MOBILEPHONE) {
         let id = item.SERVERPARTSHOP_IDS.split(",")[0];
         uni.navigateTo({
-          url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}`,
+          url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}`,
         });
       } else {
         let id = item.SERVERPARTSHOP_IDS.split(",")[0];
         uni.navigateTo({
-          url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}`,
+          url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}`,
         });
         this.isLogin = true;
       }

pages/serviceDetail/index.vue

@@ -567,7 +567,7 @@
       </view>
 
       <!-- 附近的景点 -->
-      <view class="nearbyAttractions">
+      <view class="nearbyAttractions" v-if="false">
         <view class="nearTitle">附近景点</view>
         <view class="attractionsList" v-if="nearScenic && nearScenic.length > 0">
           <view class="attractionsItem" v-for="(item, index) in nearScenic" :key="index">
@@ -936,12 +936,12 @@ export default {
       if (this.user.MEMBERSHIP_MOBILEPHONE) {
         let id = item.SERVERPARTSHOP_IDS.split(",")[0];
         uni.navigateTo({
-          url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&monthlySales=${item.MONTHLYSALES || ""}&perCapita=${item.PERCAPITA || ""}`,
+          url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}&monthlySales=${item.MONTHLYSALES || ""}&perCapita=${item.PERCAPITA || ""}`,
         });
       } else {
         let id = item.SERVERPARTSHOP_IDS.split(",")[0];
         uni.navigateTo({
-          url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&monthlySales=${item.MONTHLYSALES || ""}&perCapita=${item.PERCAPITA || ""}`,
+          url: `/pages/shopPages/shop/index?id=${id}&mid=${item.MERCHANTS_ID}&province=${item.PROVINCE_CODE}&buyType=${item.SCANCODE_ORDER}&monthlySales=${item.MONTHLYSALES || ""}&perCapita=${item.PERCAPITA || ""}`,
         });
         this.isLogin = true;
       }

pages/shopMallPage/shopType/index.vue

@@ -166,7 +166,8 @@
       <view class="shopPopupBox">
         <div class="shopPopupContent">
           <div class="detailTop">
-            <image class="detailImg" :src="good.DEFAULT_IMG || '/static/images/home/defultImg.png'" />
+            <image class="detailImg"
+              :src="good.DEFAULT_IMG || good.IMAGE_PATH || '/static/images/home/defultImg.png'" />
             <div class="box">
               <div class="nameTop">
                 <text class="name">{{ good.COMMODITY_NAME }}</text>
@@ -443,6 +444,9 @@ export default {
     this.searchText = "";
   },
   methods: {
+    handleDesc(e, item) {
+      this.good.SALEDETAIL_DESC = e.detail.value
+    },
     // 节流函数
     throttle(fn, delay) {
       let last = 0;
@@ -485,6 +489,19 @@ export default {
       }
 
       console.log("good", this.good);
+
+
+      this.good.COMMODITY_GRADE = null
+      this.good.LIMIT_TOTALCOUNT = this.good.LIMIT_TOTALCOUNT ? this.good.LIMIT_TOTALCOUNT.toString() : ""
+      this.good.LIMIT_DAILYCOUNT = this.good.LIMIT_DAILYCOUNT ? this.good.LIMIT_DAILYCOUNT.toString() : ""
+      this.good.REMINDER_DAY = this.good.REMINDER_DAY ? this.good.REMINDER_DAY.toString() : ""
+      this.good.SEND_MODE = this.good.SEND_MODE ? this.good.SEND_MODE.toString() : ""
+      this.good.AFTERSALE_NATRUE = this.good.AFTERSALE_NATRUE ? this.good.AFTERSALE_NATRUE.toString() : ""
+      this.good.DUTY_PARAGRAPH = this.good.DUTY_PARAGRAPH ? this.good.DUTY_PARAGRAPH.toString() : ""
+
+
+
+
       if (this.good.RTCOMMODITY_MULTI_ID === "默认" || !this.good.RTCOMMODITY_MULTI_ID) {
         uni.showToast({
           title: "请先选择规格！",

pages/shopPages/settlement/components/commodityItem.vue

@@ -1,20 +1,17 @@
 <template>
   <div class="flex-row space-x-12">
-    <img
+    <img class="shrink-0 self-start image_9" :src="obj.IMAGE_PATH || obj.DEFAULT_IMG || '/static/images/home/defultImg.png'
-      class="shrink-0 self-start image_9"
+      " />
-      :src="
-        obj.IMAGE_PATH || obj.DEFAULT_IMG || '/static/images/home/defultImg.png'
-      "
-    />
     <div class="flex-col info">
       <div class="flex-row justify-between">
         <div class="font_3 titleName" v-if="obj.bracketContent">
-          <span style="font-weight: 600; color: red">{{
+          <span style="font-weight: 600; color: red">
+            {{ obj.COMMODITY_RULE ? `（${obj.COMMODITY_RULE}）` : "" }}{{
               obj.bracketContent
-          }}</span
+            }}</span><span>{{ obj.restContent || "" }}</span>
-          ><span>{{ obj.restContent || "" }}</span>
         </div>
-        <div class="font_3 titleName" v-else>{{ obj.COMMODITY_NAME || "" }}</div>
+        <div class="font_3 titleName" v-else>{{ obj.COMMODITY_RULE ? `（${obj.COMMODITY_RULE}）` : "" }}{{
+          obj.COMMODITY_NAME || "" }}</div>
 
         <!-- <div class="font_3 titleName">
           {{    obj.bracketContent 
@@ -25,27 +22,17 @@
         </div>
       </div>
       <div class="flex-row justify-between">
-        <span class="font_2"
+        <span class="font_2">单价: {{ obj.COMMODITY_MEMBERPRICE }}元/{{
-          >单价: {{ obj.COMMODITY_MEMBERPRICE }}元/{{
           obj.COMMODITY_UNIT
-          }}</span
+          }}</span>
-        >
         <span class="font_2">¥{{ obj.cartItemAoumt }}</span>
       </div>
       <div class="remark" v-if="isSubmit && obj.SALEDETAIL_DESC">
-        <input
+        <input :disabled="isSubmit" class="input" v-model="obj.SALEDETAIL_DESC" />
-          :disabled="isSubmit"
-          class="input"
-          v-model="obj.SALEDETAIL_DESC"
-        />
       </div>
       <div class="remark" v-if="!isSubmit">
-        <input
+        <input class="input" @blur="handleChangeValue($event, obj)" :value="obj.SALEDETAIL_DESC"
-          class="input"
+          placeholder="这里是备注的内容" />
-          @blur="handleChangeValue($event, obj)"
-          :value="obj.SALEDETAIL_DESC"
-          placeholder="这里是备注的内容"
-        />
       </div>
       <!--    <div class="flex-col justify-start items-start text-wrapper_2" v-if="obj.SALEDETAIL_DESC">-->
       <!--      <span class="font_5 text_6">{{obj.SALEDETAIL_DESC}}</span>-->
@@ -65,7 +52,8 @@ export default {
   },
   methods: {
     handleChangeValue(e, obj) {
-      obj.SALEDETAIL_DESC = e.mp.detail.value;
+      obj.SALEDETAIL_DESC = e.detail.value;
+      this.$emit('update-desc', { COMMODITY_ID: obj.COMMODITY_ID, RTCOMMODITY_MULTI_ID: obj.RTCOMMODITY_MULTI_ID, value: e.detail.value });
     },
   },
 };
@@ -120,7 +108,8 @@ export default {
   .titleName {
     width: calc(100% - 100px);
     display: -webkit-box;
-    -webkit-line-clamp: 3; /* 设置显示的行数 */
+    -webkit-line-clamp: 3;
+    /* 设置显示的行数 */
     -webkit-box-orient: vertical;
     overflow: hidden;
     text-overflow: ellipsis;

pages/shopPages/settlement/index.vue

@@ -47,7 +47,8 @@
     </div>
 
     <div class="commodity margin_auto">
-      <CommodityItem :isSubmit="isSubmit" :obj="item" v-for="(item, index) in shopOrder.slice(0, 5)" :key="index" />
+      <CommodityItem :isSubmit="isSubmit" :obj="item" v-for="(item, index) in shopOrder.slice(0, 5)" :key="index"
+        @update-desc="updateDesc" />
       <div class="is_more" @click="isShowMore = !isShowMore">
         <img v-if="shopOrder.length > 5" :src="isShowMore
           ? '/static/images/home/up_arrow.png'
@@ -280,6 +281,10 @@ export default {
     this.$utils.addUserBehaviorNew();
   },
   methods: {
+    updateDesc({ COMMODITY_ID, RTCOMMODITY_MULTI_ID, value }) {
+      const item = this.shopOrder.find(i => i.COMMODITY_ID === COMMODITY_ID && i.RTCOMMODITY_MULTI_ID === RTCOMMODITY_MULTI_ID);
+      if (item) item.SALEDETAIL_DESC = value;
+    },
     // 选择支付方式的切换
     handlePayTypeChange(e) {
       console.log("e", e);
@@ -443,17 +448,41 @@ export default {
 
       // 因为当有些商品整数 有些商品小数 接口那边会将小数点部分直接去掉 所以我们这边处理一下 把价钱字段转为字符串
       let newShopList = JSON.parse(JSON.stringify(this.shopOrder));
+      let t_saleorderdetail = []
       newShopList.forEach((item) => {
-        item.AVERAGE_PRICE = item.AVERAGE_PRICE.toString();
+        // item.AVERAGE_PRICE = item.AVERAGE_PRICE.toString();
-        item.COMMODITY_CURRPRICE = item.COMMODITY_CURRPRICE.toString();
+        // item.COMMODITY_CURRPRICE = item.COMMODITY_CURRPRICE.toString();
-        item.ORDER_AMOUNT = item.ORDER_AMOUNT.toString();
+        // item.ORDER_AMOUNT = item.ORDER_AMOUNT.toString();
-        item.ORDER_COUNT = item.ORDER_COUNT.toString();
+        // item.ORDER_COUNT = item.ORDER_COUNT.toString();
+        // item.List = null
+        t_saleorderdetail.push({
+          COMMODITY_ID: item.COMMODITY_ID ? item.COMMODITY_ID.toString() : "",
+          COMMODITY_NAME: item.COMMODITY_NAME ? item.COMMODITY_NAME.toString() : "",
+          COMMODITY_CODE: item.COMMODITY_CODE ? item.COMMODITY_CODE.toString() : "",
+          COMMODITY_BARCODE: item.COMMODITY_BARCODE ? item.COMMODITY_BARCODE.toString() : "",
+          ISMULTI: item.ISMULTI ? item.ISMULTI.toString() : "",
+          COMMODITY_UNIT: item.COMMODITY_UNIT ? item.COMMODITY_UNIT.toString() : "",
+          COMMODITY_RULE: item.COMMODITY_RULE ? item.COMMODITY_RULE.toString() : "",
+          COMMODITY_RETAILPRICE: item.COMMODITY_RETAILPRICE ? item.COMMODITY_RETAILPRICE.toString() : "",
+          COMMODITY_PURCHASEPRICE: item.COMMODITY_PURCHASEPRICE ? item.COMMODITY_PURCHASEPRICE.toString() : "",
+          COMMODITY_MEMBERPRICE: item.COMMODITY_MEMBERPRICE ? item.COMMODITY_MEMBERPRICE.toString() : "",
+          COMMODITY_CURRPRICE: item.COMMODITY_CURRPRICE ? item.COMMODITY_CURRPRICE.toString() : "",
+          COMMODITY_STOCK: item.COMMODITY_STOCK ? item.COMMODITY_STOCK.toString() : "",
+          COMMODITY_STATE: item.COMMODITY_STATE ? item.COMMODITY_STATE.toString() : "",
+          COMMODITY_DESC: item.COMMODITY_DESC ? item.COMMODITY_DESC.toString() : "",
+          SCANCODE_ORDER: item.SCANCODE_ORDER ? item.SCANCODE_ORDER.toString() : "",
+          DUTY_PARAGRAPH: item.DUTY_PARAGRAPH ? item.DUTY_PARAGRAPH.toString() : "",
+          RTCOMMODITY_MULTI_ID: item.RTCOMMODITY_MULTI_ID ? item.RTCOMMODITY_MULTI_ID.toString() : "",
+          ORDER_COUNT: item.ORDER_COUNT ? item.ORDER_COUNT.toString() : "",
+          AVERAGE_PRICE: item.AVERAGE_PRICE ? item.AVERAGE_PRICE.toString() : "",
+          ORDER_AMOUNT: item.ORDER_AMOUNT ? item.ORDER_AMOUNT.toString() : "",
+          SALEDETAIL_DESC: item.SALEDETAIL_DESC ? item.SALEDETAIL_DESC.toString() : ""
+        });
       });
 
 
       console.log('newShopListnewShopList', newShopList);
 
-
       let req = {
         action_type: "ScanOrder",
         salebillType:
@@ -482,7 +511,7 @@ export default {
             : this.phoneNumber,
         // couponCode: '',//优惠券
         // t_saleorderdetail: JSON.stringify(this.shopOrder),
-        t_saleorderdetail: JSON.stringify(newShopList),
+        t_saleorderdetail: JSON.stringify(t_saleorderdetail),
         recommendCode: app.globalData.recommendCode || "",
         recommendId: app.globalData.recommendId || "",
         requestType: "application/x-www-form-urlencoded",
@@ -583,7 +612,7 @@ export default {
           if (this.pageType === "UnionMall") {
             this.handleBalancePayment(data.Data);
           } else {
-            this.getOrderInfo(data.Data);
+            this.getOrderInfo(data.Data, data.Data.PAY_AMOUNT);
           }
         } else {
           uni.showModal({

pages/shopPages/shop/index.vue

@@ -111,7 +111,7 @@
                       <span class="price">{{ good.COMMODITY_CURRPRICE }}</span>
                     </view>
                     <!-- 右边的加减器 -->
-                    <view class="rightPrice">
+                    <view class="rightPrice" v-if="buyType === 1">
                       <image v-show="shoppingCart[
                         good.USERDEFINEDTYPE_ID + '_' + good.id
                       ] &&
@@ -393,6 +393,8 @@ export default {
       onLoadType: "",
       monthlySales: "",//月售
       perCapita: '',// 人均
+      buyType: "",
+      isFirst: true
     };
   },
   computed: {
@@ -891,7 +893,9 @@ export default {
         .$get("/WeChat/GetCouponList", { sellerId: id })
         .then(function (data) {
           _this.couponList = data.Result_Data.List || [];
-
+          if (!_this.isFirst) {
+            return
+          }
           let tabList = [];
           let isFood = false;
           if (_this.couponList && _this.couponList.length > 0) {
@@ -916,6 +920,7 @@ export default {
 
           _this.activeTabs = isFood ? 1 : tabList[0].value;
           console.log('_this.activeTabs_this.activeTabs', _this.activeTabs);
+          _this.isFirst = false
           _this.$forceUpdate()
 
 
@@ -945,6 +950,9 @@ export default {
   onReady() { },
   onLoad(options) {
     console.log("optionsshop", options);
+    if (options.buyType) {
+      this.buyType = Number(options.buyType);
+    }
     this.stroreId = options.id;
     // this.merchatsMsg.MERCHANTS_ID = options.mid
     this.getShop(options.mid, options.type || 0); // 获取商户信息

pages/shopPages/shopDetail/index.vue

@@ -323,6 +323,7 @@
                 </div>
                 <div class="sizeBox">
                   <div class="sizeTitle">规格</div>
+
                   <scroll-view :scroll-x="true" :scroll-y="true" class="sizeScrollBox">
                     <div class="sizeList">
                       <div :class="good.RTCOMMODITY_MULTI_ID === item.RTCOMMODITY_MULTI_ID
@@ -510,7 +511,10 @@ export default {
       setOrder: "ORDERGOOD",
     }),
     ...mapMutations(["setInvitedCode"]),
-
+    // 备注的输入框
+    handleDesc(e, item) {
+      this.good.SALEDETAIL_DESC = e.detail.value
+    },
     // 收藏
     handleCollect() {
       if (this.isCollect) {
@@ -636,6 +640,7 @@ export default {
     },
     // 改变当前选中的规格
     handleChangeSelectSKULIST(value, obj) {
+      if (obj.COMMODITY_STOCK > 0) {
         console.log("value", value);
         // this.good.COMMODITY_RULE = value; 
         this.good.COMMODITY_RULE = obj.COMMODITY_NAME;
@@ -648,6 +653,12 @@ export default {
         }
         console.log("this.good", this.good);
         this.$forceUpdate()
+      } else {
+        uni.showToast({
+          title: "已售罄",
+          icon: 'error'
+        })
+      }
     },
     // 点击的锚点
     handleChangePageTab(value) {
@@ -744,10 +755,13 @@ export default {
     },
     // 加入购物车方法
     handleAddShopCar() {
+      console.log('this.good', this.good);
+
       if (
         this.good.SKULIST &&
         this.good.SKULIST.length > 0 &&
-        (this.good.COMMODITY_RULE === "默认" || !this.good.COMMODITY_RULE)
+        // (this.good.COMMODITY_RULE === "默认" || !this.good.COMMODITY_RULE)
+        (!this.good.RTCOMMODITY_MULTI_ID)
       ) {
         uni.showToast({
           title: "请先选择规格！",
@@ -806,6 +820,7 @@ export default {
             if (filterRuleList && filterRuleList.length > 0) {
               if (item.COMMODITY_ID === this.good.COMMODITY_ID) {
                 item.count = this.good.count + item.count;
+                item.SALEDETAIL_DESC = this.good.SALEDETAIL_DESC
               }
               isSame = true;
             } else {
@@ -817,6 +832,7 @@ export default {
             if (item.COMMODITY_ID === this.good.COMMODITY_ID) {
               // item.count = this.good.count;
               item.count = this.good.count + item.count
+              item.SALEDETAIL_DESC = this.good.SALEDETAIL_DESC
               isSame = true;
             } else {
               // 当前购物车中找不到同样的商品 说明是新商品 那么直接添加到购物车中
@@ -860,8 +876,6 @@ export default {
         }
       }
 
-
-
       uni.showToast({
         title: "加入成功！",
         duration: 2000,
@@ -1056,6 +1070,17 @@ export default {
         })
         .then(function (res) {
           console.log("detail", res);
+          res.Data.COMMODITY_GRADE = null
+          res.Data.LIMIT_TOTALCOUNT = res.Data.LIMIT_TOTALCOUNT.toString()
+          res.Data.LIMIT_DAILYCOUNT = res.Data.LIMIT_DAILYCOUNT.toString()
+          res.Data.REMINDER_DAY = res.Data.REMINDER_DAY.toString()
+          res.Data.SEND_MODE = res.Data.SEND_MODE.toString()
+          res.Data.AFTERSALE_NATRUE = res.Data.AFTERSALE_NATRUE.toString()
+          res.Data.DUTY_PARAGRAPH = res.Data.DUTY_PARAGRAPH.toString()
+
+
+
+
           _this.good = res.Data;
           _this.good.COMMODITY_CURRPRICE = _this.good.COMMODITY_MEMBERPRICE;
           _this.good.count = 1;
@@ -2526,6 +2551,8 @@ button:after {
     width: 100%;
     height: 80rpx;
     box-sizing: border-box;
+    position: relative;
+    z-index: 9;
 
     .shopCarBtn {
       width: 100%;

pages/useConfig/balanceManage.vue

@@ -18,7 +18,7 @@
                     </view>
                 </view>
 
-                <view class="mianTopRight">
+                <view class="mianTopRight" @click="handleGoCode">
                     <image class="userCodeImg" src="https://eshangtech.com/caiyunyiImg/userCodeImg.png" />
                     <view class="userCodeText">会员码</view>
                 </view>
@@ -69,6 +69,11 @@ export default {
     methods: {
         handleChangeTab(value) {
             this.selectTab = value
+        },
+        handleGoCode() {
+            uni.navigateTo({
+                url: "/pages/payfor/index",
+            });
         }
     }
 }

pages/useConfig/userConfig.vue

@@ -3,7 +3,8 @@
         <view class="userInfoBox" @click="handleGoUserInfoCenter">
             <view class="userInfoBoxLeft">
                 <view class="userInfoHeaderImg">
-                    <image class="headerImg" :src="user.MEMBERSHIP_HEADIMAGEURL || ''" />
+                    <image class="headerImg"
+                        :src="userInfo.MEMBERSHIP_HEADIMAGEURL || user.MEMBERSHIP_HEADIMAGEURL || ''" />
                 </view>
 
                 <view class="userInfoMessage">

pages/useConfig/userInfo.vue

@@ -57,7 +57,7 @@
         </view>
 
 
-        <view class="userInfoContent">
+        <view class="userInfoContent" v-if="false">
             <view class="userInfoItem">
                 <view class="userInfoItemLabel">真实姓名</view>
                 <view class="userInfoItemRight">
@@ -258,7 +258,35 @@ export default {
             this.birthday = this.$utils.formatDate(this.userInfo.MEMBERSHIP_BIRTHDAY) // 生日
             this.email = this.userInfo.MEMBERSHIP_EMAIL // 邮箱地址
             this.validateEmail()
+            let _data = userData;
+            let _this = this
+            _this.user.MEMBERSHIP_ID = _data.Data.MEMBERSHIP_ID || "";
+            _this.user.MEMBERSHIP_NAME = _data.Data.MEMBERSHIP_NAME || "";
+            _this.user.MEMBERSHIP_LEVEL_TEXT =
+                _data.Data.MEMBERSHIP_LEVEL_TEXT || "";
+            _this.user.COUPON_COUNT = _data.Data.COUPON_COUNT || "";
+            _this.user.PENDORDER_COUNT = _data.Data.PENDORDER_COUNT || "";
+            _this.user.RESERVATION_COUNT = _data.Data.RESERVATION_COUNT || "";
+            _this.user.ACCOUNT_BALANCE = _data.Data.ACCOUNT_BALANCE || "";
+            _this.user.ISPLUS = _data.Data.ISPLUS || "";
+            _this.user.INDUSTRY_MEMBERSHIP_ID =
+                _data.Data.INDUSTRY_MEMBERSHIP_ID || "";
+            _this.user.MEMBERSHIP_TYPE = _data.Data.MEMBERSHIP_TYPE || "";
+            _this.user.MEMBERSHIP_LEVEL = _data.Data.MEMBERSHIP_LEVEL || "";
+            _this.user.InviteCode = _data.Data.InviteCode || "";
+            _this.user.MEMBERSHIP_POINT = _data.Data.MEMBERSHIP_POINT || "";
+            _this.user.MEMBERSHIP_MOBILEPHONE =
+                _data.Data.MEMBERSHIP_MOBILEPHONE || "";
+            _this.WXProfile = _data.Data.MEMBERSHIP_HEADIMAGEURL;
+            // _this.setUser(user);
+            _this.$store.commit("setUser", _this.user);
 
+            if (_data.Data.MEMBERSHIP_HEADIMAGEURL) {
+                _this.displayedAvatarUrl = _data.Data.MEMBERSHIP_HEADIMAGEURL + '?t=' + Date.now();
+            } else {
+                _this.displayedAvatarUrl = ''; // 或者设置为默认头像 URL
+            }
+            _this.$forceUpdate()
             // this.realName = this.userInfo.MEMBERSHIP_REALNAME // 真实姓名
 
             this.$forceUpdate();

pages/user/index.vue

@@ -21,8 +21,8 @@
         <view class="userInfo">
           <view class="userInfoLeft">
             <view class="userInfoLeftTop">
-              <view class="userName">{{ inShop === 2 ? (user.MEMBERSHIP_NAME || "微信用户") : (user.NICK_NAME ||
+              <view class="userName">{{ inShop === 2 ? (userInfo.MEMBERSHIP_NAME || user.MEMBERSHIP_NAME || "微信用户") :
-                user.MEMBERSHIP_NAME || "未填写名称") }}</view>
+                (userInfo.NICK_NAME || userInfo.MEMBERSHIP_NAME || "未填写名称") }}</view>
               <view class="userLevel">
                 <image class="userLevelIcon" src="https://eshangtech.com/caiyunyiImg/levelIcon.png" />
                 <view class="userLevelName">{{ user.MEMBERSHIP_LEVEL_TEXT || "" }}</view>
@@ -42,7 +42,6 @@
             <view class="userCodeText">会员码</view>
           </view>
         </view>
-
       </view>
 
       <!-- 优惠券信息 -->
@@ -70,6 +69,8 @@
       </view>
     </view>
 
+    <!-- {{ showErrorText || "" }} -->
+
     <view class="pageContent">
       <!-- 我的订单 -->
       <view class="userOrder">
@@ -82,16 +83,19 @@
           <view class="userOrderBottomItem" @click="handleGoOrder(1, '')">
             <img class="userOrderBottomItemImg" src="https://eshangtech.com/caiyunyiImg/orderStatus1.png" />
             <view class="userOrderBottomItemText">未付款</view>
+            <view class="orderCount" v-if="mallOrderCountList[0] > 0">{{ mallOrderCountList[0] }}</view>
           </view>
 
           <view class="userOrderBottomItem" @click="handleGoOrder(2, '')">
             <img class="userOrderBottomItemImg" src="https://eshangtech.com/caiyunyiImg/orderStatus2.png" />
             <view class="userOrderBottomItemText">待发货</view>
+            <view class="orderCount" v-if="mallOrderCountList[1] > 0">{{ mallOrderCountList[1] }}</view>
           </view>
 
           <view class="userOrderBottomItem" @click="handleGoOrder(3, '')">
             <img class="userOrderBottomItemImg" src="https://eshangtech.com/caiyunyiImg/orderStatus3.png" />
             <view class="userOrderBottomItemText">待收货</view>
+            <view class="orderCount" v-if="mallOrderCountList[2] > 0">{{ mallOrderCountList[2] }}</view>
           </view>
 
           <view class="userOrderBottomItem" @click="handleGoOrder(4, '')">
@@ -152,11 +156,12 @@
           <image class="rightArrow" src="/static/images/home/rightArrow.svg" />
         </view>
         <view class="orderContent">
-          <view class="newOrderLeft" style="width: 100%; paddingright: 0">
+          <view class="newOrderLeft" style="width: 100%; padding-right: 0">
             <view class="orderFunItem" v-for="(item, index) in foodFunList" :key="index"
               @click="handleGoFoodOrder(item.value)">
               <image class="orderFunIcon" :src="item.src" />
               <text class="orderFunText">{{ item.label }}</text>
+              <view class="orderCount" v-if="item.orderCount > 0">{{ item.orderCount }}</view>
             </view>
           </view>
         </view>
@@ -380,6 +385,9 @@ export default {
       chargingObj: {},
       inShop: 0,// 判断是否在商城里面
       shopCarListCount: 0, // 购物车商品数量
+      showErrorText: "",
+      mallOrderCountList: [0, 0, 0],// 商城订单的数量
+      foodOrderCountList: [0, 0, 0],// 点餐订单的数量
     };
   },
   onLoad() {
@@ -403,10 +411,13 @@ export default {
     // if (!this.user.MEMBERSHIP_ID) {
     //   uni.navigateTo({ url: "/pages/register/index" });
     // }
-    // 拿车牌号
+
-    await this.handleGetCarCode();
     // 拿用户信息
     await this.handleGetUserDetail();
+    // 拿到订单信息
+    await this.handleGetOrderDetail()
+    // 拿车牌号
+    await this.handleGetCarCode();
 
     let seatInfo = uni.getStorageSync("seatInfo");
     if (seatInfo) {
@@ -449,6 +460,10 @@ export default {
       }
       this.shopCarListCount = count;
     }
+
+
+
+
   },
   computed: {
     ...mapGetters({
@@ -716,6 +731,7 @@ export default {
     // 用户上传头像
     async onChooseAvatar(e) {
       let _this = this;
+      _this.showErrorText = 1
       uni.uploadFile({
         url: "https://api.eshangtech.com/EShangApiMain/Picture/UploadPicture", // 你的接口 URL
         filePath: e.detail.avatarUrl,
@@ -732,6 +748,7 @@ export default {
               headImgUrl: url,
             };
             _this.WXProfile = url;
+            _this.showErrorText = _this.WXProfile
             const userInfoData = await _this.$api.$get(
               "/WeChat/UpdateMemberInfo",
               req
@@ -741,17 +758,50 @@ export default {
             }
           }
         },
+        fail: (error) => {
+          _this.showErrorText = JSON.stringify(error)
+        }
       });
     },
     // 拿到用户详情
     async handleGetUserDetail() {
-      const userData = await this.$api.getCoop({
+      let _this = this;
+      _this.$api
+        .getCoop({
           action_type: "GetMembershipInfo",
-        WechatUserId: this.user.WechatUserId,
+          WechatUserId: _this.user.WechatUserId,
+        })
+        .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 || "";
+            _this.user.MEMBERSHIP_LEVEL_TEXT =
+              _data.Data.MEMBERSHIP_LEVEL_TEXT || "";
+            _this.user.COUPON_COUNT = _data.Data.COUPON_COUNT || "";
+            _this.user.PENDORDER_COUNT = _data.Data.PENDORDER_COUNT || "";
+            _this.user.RESERVATION_COUNT = _data.Data.RESERVATION_COUNT || "";
+            _this.user.ACCOUNT_BALANCE = _data.Data.ACCOUNT_BALANCE || "";
+            _this.user.ISPLUS = _data.Data.ISPLUS || "";
+            _this.user.INDUSTRY_MEMBERSHIP_ID =
+              _data.Data.INDUSTRY_MEMBERSHIP_ID || "";
+            _this.user.MEMBERSHIP_TYPE = _data.Data.MEMBERSHIP_TYPE || "";
+            _this.user.MEMBERSHIP_LEVEL = _data.Data.MEMBERSHIP_LEVEL || "";
+            _this.user.InviteCode = _data.Data.InviteCode || "";
+            _this.user.MEMBERSHIP_POINT = _data.Data.MEMBERSHIP_POINT || "";
+            _this.user.MEMBERSHIP_MOBILEPHONE =
+              _data.Data.MEMBERSHIP_MOBILEPHONE || "";
+            _this.WXProfile = _data.Data.MEMBERSHIP_HEADIMAGEURL;
+
+            _this.$store.commit("setUser", _this.user);
+            _this.$forceUpdate()
+          } else {
+            // _this.setUser({});
+            _this.$store.commit("setUser", user);
+          }
         });
-      this.userInfo = userData.Data;
-      this.$forceUpdate();
-      console.log("this.userInfo", this.userInfo);
     },
     // 跳转去售后 即已完成的列表
     handleGo(url) {
@@ -890,6 +940,122 @@ export default {
         url:
           "/pages/useConfig/FavoriteStore"
       });
+    },
+    async handleGetOrderDetail() {
+      // 商城订单数据
+      const req = {
+        action_type: "GetMallOrderList",
+        salebillType: '3000,3001,3002,3999',
+        salebillState: "",
+        PageIndex: 1,
+        pageSize: 99999,
+        ownerUnitId: 911,
+        requestType: "application/x-www-form-urlencoded",
+      };
+      const data = await this.$api.postCoop(req);
+      console.log('商城订单', data);
+      if (data.ResultCode === "100") {
+        let list = data.Data.List
+        // 待付款
+        let obligation = []
+        // 待发货
+        let pendingShipment = []
+        // 待收货
+        let pendingReceiptOfGoods = []
+
+        if (list && list.length > 0) {
+          list.forEach((item) => {
+            if (item.SALEBILL_STATE === 1005) {
+              obligation.push(item)
+            } else if (item.SALEBILL_STATE === 1010) {
+              pendingShipment.push(item)
+            } else if (item.SALEBILL_STATE === 2010) {
+              pendingReceiptOfGoods.push(item)
+            }
+          })
+        }
+
+        let mallOrderCountList = [obligation && obligation.length > 0 ? obligation.length : 0,
+        pendingShipment && pendingShipment.length > 0 ? pendingShipment.length : 0,
+        pendingReceiptOfGoods && pendingReceiptOfGoods.length > 0 ? pendingReceiptOfGoods.length : 0,]
+        this.mallOrderCountList = mallOrderCountList
+
+      } else {
+        this.mallOrderCountList - [0, 0, 0]
+      }
+
+      const reqFood = {
+        action_type: "GetOrderList",
+        salebillType: 6000,
+        salebillState: "",
+        PageIndex: 1,
+        pageSize: 99999,
+        ownerUnitId: 911,
+        requestType: "application/x-www-form-urlencoded",
+      };
+      const dataFood = await this.$api.postCoop(reqFood);
+      console.log('点餐订单', dataFood);
+      if (dataFood.ResultCode === "100") {
+        let list = dataFood.Data.List
+        // 待付款
+        let obligation = []
+        // 待接单
+        let pendingShipment = []
+        // 制作中
+        let pendingReceiptOfGoods = []
+
+        if (list && list.length > 0) {
+          list.forEach((item) => {
+            if (item.SALEBILL_STATE === 1005) {
+              obligation.push(item)
+            } else if (item.SALEBILL_STATE === 1010) {
+              pendingShipment.push(item)
+            } else if (item.SALEBILL_STATE === 2000) {
+              pendingReceiptOfGoods.push(item)
+            }
+          })
+        }
+
+        let foodOrderCountList = [obligation && obligation.length > 0 ? obligation.length : 0,
+        pendingShipment && pendingShipment.length > 0 ? pendingShipment.length : 0,
+        pendingReceiptOfGoods && pendingReceiptOfGoods.length > 0 ? pendingReceiptOfGoods.length : 0,]
+        // this.foodOrderCountList = foodOrderCountList
+        let foodTab = JSON.parse(JSON.stringify(this.foodFunList))
+        foodTab.forEach((item) => {
+          if (item.value === 1) {
+            item.orderCount = obligation && obligation.length > 0 ? obligation.length : 0
+          } else if (item.value === 2) {
+            item.orderCount = pendingShipment && pendingShipment.length > 0 ? pendingShipment.length : 0
+          } else if (item.value === 3) {
+            item.orderCount = pendingReceiptOfGoods && pendingReceiptOfGoods.length > 0 ? pendingReceiptOfGoods.length : 0
+          }
+        })
+        this.foodFunList = foodTab
+      } else {
+        this.foodFunList = [
+          {
+            label: "待付款",
+            value: 1,
+            src: "/static/images/home/obligationIcon.svg",
+          },
+          {
+            label: "待接单",
+            value: 2,
+            src: "/static/images/home/shipmentIcon.svg",
+          },
+          {
+            label: "制作中",
+            value: 3,
+            src: "/static/images/home/receiptOfGoods.svg",
+          },
+          {
+            label: "待评价",
+            value: 4,
+            src: "/static/images/home/evaluatedIcon.svg",
+          },
+        ]
+      }
+      this.$forceUpdate()
     }
   },
 };
@@ -1191,6 +1357,7 @@ export default {
           flex-direction: column;
           align-items: center;
           justify-content: center;
+          position: relative;
 
           .userOrderBottomItemImg {
             width: 44rpx;
@@ -1207,6 +1374,17 @@ export default {
             text-align: right;
             font-style: normal;
           }
+
+          .orderCount {
+            position: absolute;
+            top: -10rpx;
+            right: 10rpx;
+            color: #fff;
+            background-color: red;
+            border-radius: 50%;
+            padding: 0rpx 8rpx;
+            font-size: 20rpx;
+          }
         }
       }
     }
@@ -1604,6 +1782,7 @@ export default {
             display: flex;
             flex-direction: column;
             align-items: center;
+            position: relative;
 
             .orderFunIcon {
               width: 48rpx;
@@ -1620,6 +1799,17 @@ export default {
               text-align: left;
               font-style: normal;
             }
+
+            .orderCount {
+              position: absolute;
+              right: -10rpx;
+              top: -10rpx;
+              color: #fff;
+              background-color: red;
+              border-radius: 50%;
+              padding: 0rpx 8rpx;
+              font-size: 20rpx;
+            }
           }
         }
 

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

@@ -566,7 +566,7 @@ var _default = {
     handleGetAdvertisementData: function handleGetAdvertisementData() {
       var _this5 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
-        var minReq, req, data1, req2, data2, res1, res2;
+        var minReq, req, data1, req2, data2, res1, res2, firstObj1, i, item, firstObj2, _i, _item;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
@@ -611,7 +611,8 @@ var _default = {
                 req = {
                   SearchParameter: {
                     OWNERUNIT_ID: 911,
-                    GOODSTYPE: 7000
+                    GOODSTYPE: 7000,
+                    USERDEFINEDTYPE_STATE: 1
                   },
                   SortStr: "OPERATE_DATE desc",
                   type: 'encryption'
@@ -623,7 +624,8 @@ var _default = {
                 req2 = {
                   SearchParameter: {
                     OWNERUNIT_ID: 911,
-                    GOODSTYPE: 7001
+                    GOODSTYPE: 7001,
+                    USERDEFINEDTYPE_STATE: 1
                   },
                   SortStr: "OPERATE_DATE desc",
                   type: 'encryption'
@@ -635,10 +637,61 @@ var _default = {
                 console.log('datadatadatadatadatadatadatadatadata', data1);
                 console.log('datadatadatadatadatadatadatadatadata', data2);
                 res1 = data1.Result_Data.List;
-                res2 = data2.Result_Data.List;
+                res2 = data2.Result_Data.List; // 修改一下 使用的是 当前时间在的范围内的第一个
-                _this5.swiperList.unshift(res1[0].USERDEFINEDTYPE_ICO);
+                firstObj1 = {};
-                _this5.poster = res2[0];
+                if (!(res1 && res1.length > 0)) {
-              case 15:
+                  _context4.next = 24;
+                  break;
+                }
+                i = 0;
+              case 16:
+                if (!(i < res1.length)) {
+                  _context4.next = 24;
+                  break;
+                }
+                item = res1[i];
+                if (!(new Date(item.PRESALE_STARTTIME).getTime() < new Date().getTime() && new Date().getTime() < new Date(item.PRESALE_ENDTIME).getTime())) {
+                  _context4.next = 21;
+                  break;
+                }
+                firstObj1 = item;
+                return _context4.abrupt("break", 24);
+              case 21:
+                i++;
+                _context4.next = 16;
+                break;
+              case 24:
+                firstObj2 = {};
+                if (!(res2 && res2.length > 0)) {
+                  _context4.next = 35;
+                  break;
+                }
+                _i = 0;
+              case 27:
+                if (!(_i < res2.length)) {
+                  _context4.next = 35;
+                  break;
+                }
+                _item = res2[_i];
+                if (!(new Date(_item.PRESALE_STARTTIME).getTime() < new Date().getTime() && new Date().getTime() < new Date(_item.PRESALE_ENDTIME).getTime())) {
+                  _context4.next = 32;
+                  break;
+                }
+                firstObj2 = _item;
+                return _context4.abrupt("break", 35);
+              case 32:
+                _i++;
+                _context4.next = 27;
+                break;
+              case 35:
+                console.log('firstObj1', firstObj1);
+                console.log('firstObj2', firstObj2);
+                _this5.swiperList.unshift(firstObj1.USERDEFINEDTYPE_ICO);
+                _this5.poster = firstObj2;
+
+                // this.swiperList.unshift(res1[0].USERDEFINEDTYPE_ICO)
+                // this.poster = res2[0]
+              case 39:
               case "end":
                 return _context4.stop();
             }

unpackage/dist/dev/mp-weixin/pages/order/buyOrder/index.wxml

@@ -1 +1 @@
-<view class="main data-v-50f48f45"><view class="mainTop data-v-50f48f45" style="{{'height:'+(menu.bottom+'px')+';'+('padding-top:'+(menu.top+'px')+';')}}"><image class="backIcon data-v-50f48f45" src="https://eshangtech.com/caiyunyiImg/backIcon.png" data-event-opts="{{[['tap',[['handleBack',['$event']]]]]}}" bindtap="__e"></image><view class="searchBox data-v-50f48f45"><image class="searchIcon data-v-50f48f45" src="/static/images/home/searchIcon.svg"></image><input class="searchText data-v-50f48f45" placeholder="搜索我的订单" confirm-type="search"/></view></view><view class="tabTypeBox data-v-50f48f45"><block wx:for="{{bigTabList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleBigTab',['$0'],[[['bigTabList','',index,'value']]]]]]]}}" class="{{['data-v-50f48f45',selectBigTab===item.value?'bigTabItem selectBigTabItem':'bigTabItem']}}" bindtap="__e">{{''+item.label+''}}</view></block></view><view class="smallTypeBox data-v-50f48f45"><block wx:for="{{tabList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleTab',['$0'],[[['tabList','',index,'value']]]]]]]}}" class="{{['data-v-50f48f45',currentTab===item.value?'smallTabItem selectSmallTabItem':'smallTabItem']}}" bindtap="__e">{{''+item.label+''}}<block wx:if="{{currentTab===item.value}}"><image class="closeIcon data-v-50f48f45" src="https://eshangtech.com/caiyunyiImg/closeIcon.png"></image></block></view></block></view><scroll-view class="orderListBox data-v-50f48f45" style="{{'height:'+('calc(100vh - '+menu.bottom+'px - 42px - 35px - 35px)')+';'}}" scroll-y="{{true}}"><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goEvaluate',['$0'],[[['orderList','',index]]]]]]]}}" class="orderItem data-v-50f48f45" bindtap="__e"><view class="orderItemTop data-v-50f48f45"><view class="orderItemTopLeft data-v-50f48f45"><image class="orderItemIcon data-v-50f48f45" src="https://eshangtech.com/caiyunyiImg/storeIcon.png"></image><view class="orderItemLabel data-v-50f48f45">{{item.SUPPLIER_NAME||""}}</view></view><view class="orderItemTopRight data-v-50f48f45"><view class="statusBox data-v-50f48f45">{{item.SALEBILL_STATE_TEXT||""}}</view></view></view><block wx:for="{{item.IMAGELIST}}" wx:for-item="subItem" wx:for-index="subIndex" wx:key="subIndex"><view class="orderItemCenter data-v-50f48f45"><view class="orderItemCenterLeft data-v-50f48f45"><image class="orderItemShopImg data-v-50f48f45" src="{{subItem.IMAGE_PATH||'https://eshangtech.com/ShopICO/no-picture.png'}}"></image></view><view class="orderItemCenterRight data-v-50f48f45"><view class="orderItemCenterRightLeft data-v-50f48f45"><view class="orderItemRightLeftLabel data-v-50f48f45">{{subItem.COMMODITY_NAME||""}}</view><view class="orderItemRightLeftSpecifications data-v-50f48f45"></view></view><view class="orderItemCenterRightRight data-v-50f48f45"><view class="unitPrice data-v-50f48f45">¥180.88</view><view class="orderItemQuantity data-v-50f48f45">x1</view></view></view></view></block><view class="orderItemMoneyBox data-v-50f48f45"><label class="orderItemUnit _span data-v-50f48f45">实付款：</label><label class="orderItemMoney _span data-v-50f48f45">{{"¥"+(item.PAY_AMOUNT||"")}}</label></view><view class="orderItemBottom data-v-50f48f45"><view class="orderItemBottomLeft data-v-50f48f45"><view class="orderItemBottomLeftMore data-v-50f48f45">更多</view></view><view class="orderItemBottomRight data-v-50f48f45"><block wx:if="{{item.SALEBILL_STATE>3000&&item.SALEBILL_STATE<=5000}}"><view class="orderItemBottomRightEvaluate data-v-50f48f45">评价</view></block><view data-event-opts="{{[['tap',[['handleGoStore',['$event']]]]]}}" class="orderItemBottomRightBuyAgain data-v-50f48f45" catchtap="__e">再次购买</view></view></view></view></block></scroll-view></view>
+<view class="main data-v-50f48f45"><view class="mainTop data-v-50f48f45" style="{{'height:'+(menu.bottom+'px')+';'+('padding-top:'+(menu.top+'px')+';')}}"><image class="backIcon data-v-50f48f45" src="https://eshangtech.com/caiyunyiImg/backIcon.png" data-event-opts="{{[['tap',[['handleBack',['$event']]]]]}}" bindtap="__e"></image><view class="searchBox data-v-50f48f45"><image class="searchIcon data-v-50f48f45" src="/static/images/home/searchIcon.svg"></image><input class="searchText data-v-50f48f45" placeholder="搜索我的订单" confirm-type="search"/></view></view><view class="tabTypeBox data-v-50f48f45"><block wx:for="{{bigTabList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleBigTab',['$0'],[[['bigTabList','',index,'value']]]]]]]}}" class="{{['data-v-50f48f45',selectBigTab===item.value?'bigTabItem selectBigTabItem':'bigTabItem']}}" bindtap="__e">{{''+item.label+''}}</view></block></view><view class="smallTypeBox data-v-50f48f45"><block wx:for="{{tabList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleTab',['$0'],[[['tabList','',index,'value']]]]]]]}}" class="{{['data-v-50f48f45',currentTab===item.value?'smallTabItem selectSmallTabItem':'smallTabItem']}}" bindtap="__e">{{''+item.label+''}}<block wx:if="{{currentTab===item.value}}"><image class="closeIcon data-v-50f48f45" src="https://eshangtech.com/caiyunyiImg/closeIcon.png"></image></block></view></block></view><scroll-view class="orderListBox data-v-50f48f45" style="{{'height:'+('calc(100vh - '+menu.bottom+'px - 42px - 35px - 35px)')+';'}}" scroll-y="{{true}}"><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goEvaluate',['$0'],[[['orderList','',index]]]]]]]}}" class="orderItem data-v-50f48f45" bindtap="__e"><view class="orderItemTop data-v-50f48f45"><view class="orderItemTopLeft data-v-50f48f45"><image class="orderItemIcon data-v-50f48f45" src="https://eshangtech.com/caiyunyiImg/storeIcon.png"></image><view class="orderItemLabel data-v-50f48f45">{{item.SUPPLIER_NAME||""}}</view></view><view class="orderItemTopRight data-v-50f48f45"><view class="statusBox data-v-50f48f45">{{item.SALEBILL_STATE_TEXT||""}}</view></view></view><block wx:for="{{item.IMAGELIST}}" wx:for-item="subItem" wx:for-index="subIndex" wx:key="subIndex"><view class="orderItemCenter data-v-50f48f45"><view class="orderItemCenterLeft data-v-50f48f45"><image class="orderItemShopImg data-v-50f48f45" src="{{subItem.IMAGE_PATH||'https://eshangtech.com/ShopICO/no-picture.png'}}"></image></view><view class="orderItemCenterRight data-v-50f48f45"><view class="orderItemCenterRightLeft data-v-50f48f45"><view class="orderItemRightLeftLabel data-v-50f48f45">{{subItem.COMMODITY_NAME||""}}</view><view class="orderItemRightLeftSpecifications data-v-50f48f45"></view></view><view class="orderItemCenterRightRight data-v-50f48f45"><view class="unitPrice data-v-50f48f45">¥180.88</view><view class="orderItemQuantity data-v-50f48f45">x1</view></view></view></view></block><view class="orderItemMoneyBox data-v-50f48f45"><label class="orderItemUnit _span data-v-50f48f45">实付款：</label><label class="orderItemMoney _span data-v-50f48f45">{{"¥"+(item.PAY_AMOUNT||"")}}</label></view><block wx:if="{{false}}"><view class="orderItemBottom data-v-50f48f45"><view class="orderItemBottomLeft data-v-50f48f45"><view class="orderItemBottomLeftMore data-v-50f48f45">更多</view></view><view class="orderItemBottomRight data-v-50f48f45"><block wx:if="{{item.SALEBILL_STATE>3000&&item.SALEBILL_STATE<=5000}}"><view class="orderItemBottomRightEvaluate data-v-50f48f45">评价</view></block><view data-event-opts="{{[['tap',[['handleGoStore',['$event']]]]]}}" class="orderItemBottomRightBuyAgain data-v-50f48f45" catchtap="__e">再次购买</view></view></view></block></view></block></scroll-view></view>

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

@@ -88,7 +88,6 @@ page.data-v-4e9fff16 {
   box-sizing: border-box;
   margin-bottom: 24rpx;
 }
-.order-list.data-v-4e9fff16,
 .coupon.data-v-4e9fff16 {
   padding: 20rpx 0;
   box-sizing: border-box;
@@ -96,6 +95,12 @@ page.data-v-4e9fff16 {
   display: flex;
   color: #000000;
 }
+.order-list.data-v-4e9fff16 {
+  padding: 20rpx 0;
+  box-sizing: border-box;
+  background-color: #fff;
+  color: #000000;
+}
 .order-name.data-v-4e9fff16 {
   font-size: 26rpx;
   flex: 0.7;

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

@@ -97,7 +97,6 @@ page.data-v-8f520710 {
   box-sizing: border-box;
   margin-bottom: 24rpx;
 }
-.order-list.data-v-8f520710,
 .coupon.data-v-8f520710 {
   padding: 20rpx 0;
   box-sizing: border-box;
@@ -105,6 +104,12 @@ page.data-v-8f520710 {
   display: flex;
   color: #000000;
 }
+.order-list.data-v-8f520710 {
+  padding: 20rpx 0;
+  box-sizing: border-box;
+  background-color: #fff;
+  color: #000000;
+}
 .order-name.data-v-8f520710 {
   font-size: 26rpx;
   flex: 0.7;

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

@@ -159,10 +159,156 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 30));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
 var _vuex = __webpack_require__(/*! vuex */ 33);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+//
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+// let barcode = require('../../common/js/JsBarcode.all.js')
 var UniPopup = function UniPopup() {
   __webpack_require__.e(/*! require.ensure | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then((function () {
     return resolve(__webpack_require__(/*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 480));
@@ -188,11 +334,15 @@ var _default = {
       loginType: "",
       barcodeImg: "",
       // 条码转的图片路径
-      qrcodeImg: "" // 二维码图片转的路径
+      qrcodeImg: "",
+      // 二维码图片转的路径
+      isLoading: false,
+      WXProfile: "",
+      user: {}
     };
   },
-
+  computed: {
-  computed: _objectSpread(_objectSpread({}, (0, _vuex.mapGetters)(["user"])), {}, {
+    // ...mapGetters(["user"]),
     barcodeHeight: function barcodeHeight() {
       return 120 / 750 * uni.getSystemInfoSync().windowWidth;
     },
@@ -202,11 +352,71 @@ var _default = {
     qrcodeHeight: function qrcodeHeight() {
       return 360 / 750 * uni.getSystemInfoSync().windowWidth;
     }
-  }),
+  },
   components: {
     UniPopup: UniPopup
   },
   methods: {
+    // 拿用户最新的user信息
+    handleGetUserInfo: function handleGetUserInfo() {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var _this, vuex, vuexObj, data, _data;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _this = _this2;
+                vuex = uni.getStorageSync('vuex');
+                vuexObj = {};
+                if (vuex) {
+                  vuexObj = JSON.parse(vuex);
+                  console.log('vuexObjvuexObjvuexObj', JSON.parse(JSON.stringify(vuexObj)));
+                }
+                _context.next = 6;
+                return _this.$api.getCoop({
+                  action_type: "GetMembershipInfo",
+                  // WechatUserId: _this.user.WechatUserId,
+                  WechatUserId: vuexObj.user.WechatUserId
+                });
+              case 6:
+                data = _context.sent;
+                // .then(function (data) {
+                if (data.ResultCode === "100") {
+                  _data = data;
+                  _this.user.MEMBERSHIP_ID = _data.Data.MEMBERSHIP_ID || "";
+                  _this.user.WechatUserId = _data.Data.WechatUserId || "";
+                  _this.user.MEMBERSHIP_NAME = _data.Data.MEMBERSHIP_NAME || "";
+                  _this.user.MEMBERSHIP_LEVEL_TEXT = _data.Data.MEMBERSHIP_LEVEL_TEXT || "";
+                  _this.user.COUPON_COUNT = _data.Data.COUPON_COUNT || "";
+                  _this.user.PENDORDER_COUNT = _data.Data.PENDORDER_COUNT || "";
+                  _this.user.RESERVATION_COUNT = _data.Data.RESERVATION_COUNT || "";
+                  _this.user.ACCOUNT_BALANCE = _data.Data.ACCOUNT_BALANCE || "";
+                  _this.user.ISPLUS = _data.Data.ISPLUS || "";
+                  _this.user.INDUSTRY_MEMBERSHIP_ID = _data.Data.INDUSTRY_MEMBERSHIP_ID || "";
+                  _this.user.MEMBERSHIP_TYPE = _data.Data.MEMBERSHIP_TYPE || "";
+                  _this.user.MEMBERSHIP_LEVEL = _data.Data.MEMBERSHIP_LEVEL || "";
+                  _this.user.InviteCode = _data.Data.InviteCode || "";
+                  _this.user.MEMBERSHIP_POINT = _data.Data.MEMBERSHIP_POINT || "";
+                  _this.user.MEMBERSHIP_MOBILEPHONE = _data.Data.MEMBERSHIP_MOBILEPHONE || "";
+                  _this.WXProfile = _data.Data.MEMBERSHIP_HEADIMAGEURL;
+                  // _this.setUser(user);
+                  _this.$store.commit("setUser", _this.user);
+                  _this.$forceUpdate();
+                  _this.showAvatar = true;
+                } else {
+                  // _this.setUser({});
+                  // _this.$store.commit("setUser", user);
+                }
+                // });
+              case 8:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
     // 快捷支付
     handleRealGoPay: function handleRealGoPay(payType) {
       if (this.loginType === "android") {
@@ -261,6 +471,7 @@ var _default = {
       _this.$utils.qrc("qrcode", code, _this.qrcodeHeight, _this.qrcodeHeight, null, "../../static/images/home/caiyunLogo.png");
       //   _this.$utils.qrc('qrcode2', code, _this.qrcodeHeight2, _this.qrcodeHeight2, null, '../../../static/images/gsuyiw.png')
       _this.showCode = code.substring(0, 4) + " " + "*".repeat("6");
+      setTimeout(function () {
         wx.canvasToTempFilePath({
           canvasId: "barcode",
           success: function success(res) {
@@ -283,6 +494,7 @@ var _default = {
             _this.$forceUpdate();
           }
         });
+      }, 300);
       _this.$forceUpdate();
       _this.timer = setInterval(function () {
         _this.getCode();
@@ -325,18 +537,24 @@ var _default = {
     // },
     getCode: function getCode() {
       var _this = this;
+      this.isLoading = true;
+      if (!_this.user.MEMBERSHIP_ID) {
+        return;
+      }
       this.barcodeImg = "";
       this.qrcodeImg = "";
       this.$api
       // .$get("/WeChat/GetMemberECode", { couponCode: this.cid || "" })
       .$get("/WeChat/GetMemberECode", {
-        membershipId: _this.user.MEMBERSHIP_ID || ""
+        membershipId: _this.user.MEMBERSHIP_ID || "",
+        couponCode: this.cid || ""
       }).then(function (res) {
         console.log("resdsadasd", res);
         if (res.Result_Code === 100) {
           _this.allCode = res.Result_Data.Membership_ECode;
           _this.paintCode(res.Result_Data.Membership_ECode);
         }
+        _this.isLoading = false;
       });
     },
     getCouponLsit: function getCouponLsit() {
@@ -378,18 +596,35 @@ var _default = {
     // }, 5000)
   },
   onLoad: function onLoad(option) {
-    var type = uni.getStorageSync("loginType");
+    var _this3 = this;
-    this.loginType = type;
+    return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      var type;
+      return _regenerator.default.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              type = uni.getStorageSync("loginType");
+              _this3.loginType = type;
               console.log("option", option);
               if (option.cid) {
-      this.cid = option.cid;
+                _this3.cid = option.cid;
               } else {
-      this.cid = "";
+                _this3.cid = "";
-      this.choeseCouponIndex = null;
+                _this3.choeseCouponIndex = null;
               }
-    this.getCouponLsit();
+              _context2.next = 6;
-    this.getCode();
+              return _this3.handleGetUserInfo();
-    this.$utils.addUserBehaviorNew();
+            case 6:
+              _this3.getCouponLsit();
+              _this3.getCode();
+              _this3.$utils.addUserBehaviorNew();
+            case 9:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }))();
   },
   onHide: function onHide() {
     clearInterval(this.timer);

unpackage/dist/dev/mp-weixin/pages/register/index.wxml

@@ -1 +1 @@
-<view class="main data-v-9b4697c2"><view class="content data-v-9b4697c2"><view class="contentTitle data-v-9b4697c2">用户隐私保护政策确认</view><view class="contentText data-v-9b4697c2">尊敬的用户：</view><view class="contentText data-v-9b4697c2">为了更好的维护您的权益，我们对<text data-event-opts="{{[['tap',[['handleOpenPrivacyContract',['$event']]]]]}}" class="tips data-v-9b4697c2" bindtap="__e">《彩云驿出行隐私保护指引》</text>进行了更新，特向您推送本更新提示，请仔细阅读并充分理解相关条款。</view><view class="contentText data-v-9b4697c2">您点击“立即授权”，即代表您已经阅读并同意更新后的<text data-event-opts="{{[['tap',[['handleOpenPrivacyContract',['$event']]]]]}}" class="tips data-v-9b4697c2" bindtap="__e">《彩云驿出行隐私保护指引》</text>条款。</view><view class="imgbox data-v-9b4697c2"><image class="img data-v-9b4697c2" src="/static/images/home/registerIcon.png"></image></view><block wx:if="{{!user.MEMBERSHIP_ID}}"><view class="desc newBtnFixed _div data-v-9b4697c2"><button class="loginBtn data-v-9b4697c2" type="primary" open-type="getUserInfo" data-event-opts="{{[['getuserinfo',[['bindGetUserInfo',['$event']]]]]}}" bindgetuserinfo="__e">手机号快捷登录</button></view></block><block wx:else><block wx:if="{{user.MEMBERSHIP_ID&&!user.MEMBERSHIP_MOBILEPHONE}}"><view class="desc newBtnFixed _div data-v-9b4697c2"><button class="loginBtn data-v-9b4697c2" type="primary" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e">快速登录账号</button></view></block></block><block wx:if="{{!user.MEMBERSHIP_ID}}"><view data-event-opts="{{[['tap',[['handleCancel',['$event']]]]]}}" class="cancelBtn _div data-v-9b4697c2" bindtap="__e"><view class="cancel _div data-v-9b4697c2">取消授权</view></view></block></view><block wx:if="{{false}}"><view class="page-body _div data-v-9b4697c2"><view class="top-regigter _div data-v-9b4697c2"><image src="https://eshangtech.com/ShopICO/login_logo.png" class="data-v-9b4697c2"></image><block wx:if="{{!user.MEMBERSHIP_ID}}"><view class="desc _div data-v-9b4697c2"><button type="primary" open-type="getUserInfo" data-event-opts="{{[['getuserinfo',[['bindGetUserInfo',['$event']]]]]}}" bindgetuserinfo="__e" class="data-v-9b4697c2">手机号快捷登录</button></view></block><block wx:else><block wx:if="{{user.MEMBERSHIP_ID&&!user.MEMBERSHIP_MOBILEPHONE}}"><view class="desc _div data-v-9b4697c2"><button type="primary" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e" class="data-v-9b4697c2">快速登录账号</button></view></block></block></view><block wx:if="{{showPrivacy}}"><view class="privacyMeng data-v-9b4697c2"></view></block><block wx:if="{{showPrivacy}}"><view class="privacy data-v-9b4697c2"><view class="privacyContent data-v-9b4697c2"><view class="contentTitle _p data-v-9b4697c2">用户隐私保护提示</view><view class="contentWord data-v-9b4697c2">感谢您使用本产品，您使用本产品前应当仔细阅读并同意<text data-event-opts="{{[['tap',[['handleOpenPrivacyContract',['$event']]]]]}}" class="tips data-v-9b4697c2" bindtap="__e">《小程序隐私保护指引》</text>当您点击同意并开始使用产品服务时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束。如您拒绝，将无法更好的体验产品。</view></view><view class="btnList data-v-9b4697c2"><button data-event-opts="{{[['tap',[['handleRefuse',['$event']]]]]}}" class="btns noAgree data-v-9b4697c2" bindtap="__e">拒绝</button><button class="btns agree data-v-9b4697c2" id="agree-btn3" open-type="agreePrivacyAuthorization" data-event-opts="{{[['agreeprivacyauthorization',[['handleAgreePrivacyAuthorization',['$event']]]]]}}" bindagreeprivacyauthorization="__e">同意</button></view></view></block></view></block></view>
+<view class="main data-v-9b4697c2"><view class="content data-v-9b4697c2"><view class="contentTitle data-v-9b4697c2">用户隐私保护政策确认</view><view class="contentText data-v-9b4697c2">尊敬的用户：</view><view class="contentText data-v-9b4697c2">为了更好的维护您的权益，我们对<text data-event-opts="{{[['tap',[['handleOpenPrivacyContract',['$event']]]]]}}" class="tips data-v-9b4697c2" bindtap="__e">《彩云驿出行隐私保护指引》</text>进行了更新，特向您推送本更新提示，请仔细阅读并充分理解相关条款。</view><view class="contentText data-v-9b4697c2">您点击“立即授权”，即代表您已经阅读并同意更新后的<text data-event-opts="{{[['tap',[['handleOpenPrivacyContract',['$event']]]]]}}" class="tips data-v-9b4697c2" bindtap="__e">《彩云驿出行隐私保护指引》</text>条款。</view><view class="imgbox data-v-9b4697c2"><image class="img data-v-9b4697c2" src="https://eshangtech.com/caiyunyiImg/registerIcon.png"></image></view><block wx:if="{{!user.MEMBERSHIP_ID}}"><view class="desc newBtnFixed _div data-v-9b4697c2"><button class="loginBtn data-v-9b4697c2" type="primary" open-type="getUserInfo" data-event-opts="{{[['getuserinfo',[['bindGetUserInfo',['$event']]]]]}}" bindgetuserinfo="__e">手机号快捷登录</button></view></block><block wx:else><block wx:if="{{user.MEMBERSHIP_ID&&!user.MEMBERSHIP_MOBILEPHONE}}"><view class="desc newBtnFixed _div data-v-9b4697c2"><button class="loginBtn data-v-9b4697c2" type="primary" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e">快速登录账号</button></view></block></block><block wx:if="{{!user.MEMBERSHIP_ID}}"><view data-event-opts="{{[['tap',[['handleCancel',['$event']]]]]}}" class="cancelBtn _div data-v-9b4697c2" bindtap="__e"><view class="cancel _div data-v-9b4697c2">取消授权</view></view></block></view><block wx:if="{{false}}"><view class="page-body _div data-v-9b4697c2"><view class="top-regigter _div data-v-9b4697c2"><image src="https://eshangtech.com/ShopICO/login_logo.png" class="data-v-9b4697c2"></image><block wx:if="{{!user.MEMBERSHIP_ID}}"><view class="desc _div data-v-9b4697c2"><button type="primary" open-type="getUserInfo" data-event-opts="{{[['getuserinfo',[['bindGetUserInfo',['$event']]]]]}}" bindgetuserinfo="__e" class="data-v-9b4697c2">手机号快捷登录</button></view></block><block wx:else><block wx:if="{{user.MEMBERSHIP_ID&&!user.MEMBERSHIP_MOBILEPHONE}}"><view class="desc _div data-v-9b4697c2"><button type="primary" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e" class="data-v-9b4697c2">快速登录账号</button></view></block></block></view><block wx:if="{{showPrivacy}}"><view class="privacyMeng data-v-9b4697c2"></view></block><block wx:if="{{showPrivacy}}"><view class="privacy data-v-9b4697c2"><view class="privacyContent data-v-9b4697c2"><view class="contentTitle _p data-v-9b4697c2">用户隐私保护提示</view><view class="contentWord data-v-9b4697c2">感谢您使用本产品，您使用本产品前应当仔细阅读并同意<text data-event-opts="{{[['tap',[['handleOpenPrivacyContract',['$event']]]]]}}" class="tips data-v-9b4697c2" bindtap="__e">《小程序隐私保护指引》</text>当您点击同意并开始使用产品服务时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束。如您拒绝，将无法更好的体验产品。</view></view><view class="btnList data-v-9b4697c2"><button data-event-opts="{{[['tap',[['handleRefuse',['$event']]]]]}}" class="btns noAgree data-v-9b4697c2" bindtap="__e">拒绝</button><button class="btns agree data-v-9b4697c2" id="agree-btn3" open-type="agreePrivacyAuthorization" data-event-opts="{{[['agreeprivacyauthorization',[['handleAgreePrivacyAuthorization',['$event']]]]]}}" bindagreeprivacyauthorization="__e">同意</button></view></view></block></view></block></view>

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

@@ -478,12 +478,12 @@ var _default = {
       if (this.user.MEMBERSHIP_MOBILEPHONE) {
         var id = item.SERVERPARTSHOP_IDS.split(",")[0];
         uni.navigateTo({
-          url: "/pages/shopPages/shop/index?id=".concat(id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE)
+          url: "/pages/shopPages/shop/index?id=".concat(id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE, "&buyType=").concat(item.SCANCODE_ORDER)
         });
       } else {
         var _id = item.SERVERPARTSHOP_IDS.split(",")[0];
         uni.navigateTo({
-          url: "/pages/shopPages/shop/index?id=".concat(_id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE)
+          url: "/pages/shopPages/shop/index?id=".concat(_id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE, "&buyType=").concat(item.SCANCODE_ORDER)
         });
         this.isLogin = true;
       }

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

@@ -127,16 +127,10 @@ var render = function () {
         }
       })
     : null
-  var g6 = _vm.nearScenic && _vm.nearScenic.length > 0
+  var g6 = false ? undefined : null
-  var l1 = g6
+  var l1 =
-    ? _vm.__map(_vm.nearScenic, function (item, index) {
+     false
-        var $orig = _vm.__get_orig(item)
+      ? undefined
-        var g7 = item.ImageList && item.ImageList.length > 0
-        return {
-          $orig: $orig,
-          g7: g7,
-        }
-      })
       : null
   _vm.$mp.data = Object.assign(
     {},
@@ -682,12 +676,12 @@ var _default = {
       if (this.user.MEMBERSHIP_MOBILEPHONE) {
         var id = item.SERVERPARTSHOP_IDS.split(",")[0];
         uni.navigateTo({
-          url: "/pages/shopPages/shop/index?id=".concat(id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE, "&monthlySales=").concat(item.MONTHLYSALES || "", "&perCapita=").concat(item.PERCAPITA || "")
+          url: "/pages/shopPages/shop/index?id=".concat(id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE, "&buyType=").concat(item.SCANCODE_ORDER, "&monthlySales=").concat(item.MONTHLYSALES || "", "&perCapita=").concat(item.PERCAPITA || "")
         });
       } else {
         var _id = item.SERVERPARTSHOP_IDS.split(",")[0];
         uni.navigateTo({
-          url: "/pages/shopPages/shop/index?id=".concat(_id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE, "&monthlySales=").concat(item.MONTHLYSALES || "", "&perCapita=").concat(item.PERCAPITA || "")
+          url: "/pages/shopPages/shop/index?id=".concat(_id, "&mid=").concat(item.MERCHANTS_ID, "&province=").concat(item.PROVINCE_CODE, "&buyType=").concat(item.SCANCODE_ORDER, "&monthlySales=").concat(item.MONTHLYSALES || "", "&perCapita=").concat(item.PERCAPITA || "")
         });
         this.isLogin = true;
       }

unpackage/dist/dev/mp-weixin/pages/shopMallPage/shopType/index.js

@@ -403,6 +403,9 @@ var _default = {
     this.searchText = "";
   },
   methods: {
+    handleDesc: function handleDesc(e, item) {
+      this.good.SALEDETAIL_DESC = e.detail.value;
+    },
     // 节流函数
     throttle: function throttle(fn, delay) {
       var last = 0;
@@ -446,6 +449,13 @@ var _default = {
         return;
       }
       console.log("good", this.good);
+      this.good.COMMODITY_GRADE = null;
+      this.good.LIMIT_TOTALCOUNT = this.good.LIMIT_TOTALCOUNT ? this.good.LIMIT_TOTALCOUNT.toString() : "";
+      this.good.LIMIT_DAILYCOUNT = this.good.LIMIT_DAILYCOUNT ? this.good.LIMIT_DAILYCOUNT.toString() : "";
+      this.good.REMINDER_DAY = this.good.REMINDER_DAY ? this.good.REMINDER_DAY.toString() : "";
+      this.good.SEND_MODE = this.good.SEND_MODE ? this.good.SEND_MODE.toString() : "";
+      this.good.AFTERSALE_NATRUE = this.good.AFTERSALE_NATRUE ? this.good.AFTERSALE_NATRUE.toString() : "";
+      this.good.DUTY_PARAGRAPH = this.good.DUTY_PARAGRAPH ? this.good.DUTY_PARAGRAPH.toString() : "";
       if (this.good.RTCOMMODITY_MULTI_ID === "默认" || !this.good.RTCOMMODITY_MULTI_ID) {
         uni.showToast({
           title: "请先选择规格！",

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

@@ -163,19 +163,6 @@ exports.default = void 0;
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 var _default = {
   props: {
     obj: {},
@@ -186,7 +173,12 @@ var _default = {
   },
   methods: {
     handleChangeValue: function handleChangeValue(e, obj) {
-      obj.SALEDETAIL_DESC = e.mp.detail.value;
+      obj.SALEDETAIL_DESC = e.detail.value;
+      this.$emit('update-desc', {
+        COMMODITY_ID: obj.COMMODITY_ID,
+        RTCOMMODITY_MULTI_ID: obj.RTCOMMODITY_MULTI_ID,
+        value: e.detail.value
+      });
     }
   }
 };

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||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.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_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><label class="font_2 _span data-v-5a6f0e03">{{"¥"+obj.cartItemAoumt}}</label></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||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><label class="font_2 _span data-v-5a6f0e03">{{"¥"+obj.cartItemAoumt}}</label></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

@@ -355,6 +355,15 @@ var _default = {
     }))();
   },
   methods: {
+    updateDesc: function updateDesc(_ref) {
+      var COMMODITY_ID = _ref.COMMODITY_ID,
+        RTCOMMODITY_MULTI_ID = _ref.RTCOMMODITY_MULTI_ID,
+        value = _ref.value;
+      var item = this.shopOrder.find(function (i) {
+        return i.COMMODITY_ID === COMMODITY_ID && i.RTCOMMODITY_MULTI_ID === RTCOMMODITY_MULTI_ID;
+      });
+      if (item) item.SALEDETAIL_DESC = value;
+    },
     // 选择支付方式的切换
     handlePayTypeChange: function handlePayTypeChange(e) {
       console.log("e", e);
@@ -476,7 +485,7 @@ var _default = {
     createOrder: function createOrder() {
       var _this5 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var DATAFORMATType, openId, app, newShopList, req, data, _this5$addressInfo$ME, _this5$addressInfo$ME2, provinceId, cityId, districtId, streetId, skuBase, priceContentBase, _req, pingnuoData, shopCarList, newList;
+        var DATAFORMATType, openId, app, newShopList, t_saleorderdetail, req, data, _this5$addressInfo$ME, _this5$addressInfo$ME2, provinceId, cityId, districtId, streetId, skuBase, priceContentBase, _req, pingnuoData, shopCarList, newList;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
@@ -556,11 +565,36 @@ var _default = {
                 console.log("this.user", _this5.user);
                 app = getApp(); // 因为当有些商品整数 有些商品小数 接口那边会将小数点部分直接去掉 所以我们这边处理一下 把价钱字段转为字符串
                 newShopList = JSON.parse(JSON.stringify(_this5.shopOrder));
+                t_saleorderdetail = [];
                 newShopList.forEach(function (item) {
-                  item.AVERAGE_PRICE = item.AVERAGE_PRICE.toString();
+                  // item.AVERAGE_PRICE = item.AVERAGE_PRICE.toString();
-                  item.COMMODITY_CURRPRICE = item.COMMODITY_CURRPRICE.toString();
+                  // item.COMMODITY_CURRPRICE = item.COMMODITY_CURRPRICE.toString();
-                  item.ORDER_AMOUNT = item.ORDER_AMOUNT.toString();
+                  // item.ORDER_AMOUNT = item.ORDER_AMOUNT.toString();
-                  item.ORDER_COUNT = item.ORDER_COUNT.toString();
+                  // item.ORDER_COUNT = item.ORDER_COUNT.toString();
+                  // item.List = null
+                  t_saleorderdetail.push({
+                    COMMODITY_ID: item.COMMODITY_ID ? item.COMMODITY_ID.toString() : "",
+                    COMMODITY_NAME: item.COMMODITY_NAME ? item.COMMODITY_NAME.toString() : "",
+                    COMMODITY_CODE: item.COMMODITY_CODE ? item.COMMODITY_CODE.toString() : "",
+                    COMMODITY_BARCODE: item.COMMODITY_BARCODE ? item.COMMODITY_BARCODE.toString() : "",
+                    ISMULTI: item.ISMULTI ? item.ISMULTI.toString() : "",
+                    COMMODITY_UNIT: item.COMMODITY_UNIT ? item.COMMODITY_UNIT.toString() : "",
+                    COMMODITY_RULE: item.COMMODITY_RULE ? item.COMMODITY_RULE.toString() : "",
+                    COMMODITY_RETAILPRICE: item.COMMODITY_RETAILPRICE ? item.COMMODITY_RETAILPRICE.toString() : "",
+                    COMMODITY_PURCHASEPRICE: item.COMMODITY_PURCHASEPRICE ? item.COMMODITY_PURCHASEPRICE.toString() : "",
+                    COMMODITY_MEMBERPRICE: item.COMMODITY_MEMBERPRICE ? item.COMMODITY_MEMBERPRICE.toString() : "",
+                    COMMODITY_CURRPRICE: item.COMMODITY_CURRPRICE ? item.COMMODITY_CURRPRICE.toString() : "",
+                    COMMODITY_STOCK: item.COMMODITY_STOCK ? item.COMMODITY_STOCK.toString() : "",
+                    COMMODITY_STATE: item.COMMODITY_STATE ? item.COMMODITY_STATE.toString() : "",
+                    COMMODITY_DESC: item.COMMODITY_DESC ? item.COMMODITY_DESC.toString() : "",
+                    SCANCODE_ORDER: item.SCANCODE_ORDER ? item.SCANCODE_ORDER.toString() : "",
+                    DUTY_PARAGRAPH: item.DUTY_PARAGRAPH ? item.DUTY_PARAGRAPH.toString() : "",
+                    RTCOMMODITY_MULTI_ID: item.RTCOMMODITY_MULTI_ID ? item.RTCOMMODITY_MULTI_ID.toString() : "",
+                    ORDER_COUNT: item.ORDER_COUNT ? item.ORDER_COUNT.toString() : "",
+                    AVERAGE_PRICE: item.AVERAGE_PRICE ? item.AVERAGE_PRICE.toString() : "",
+                    ORDER_AMOUNT: item.ORDER_AMOUNT ? item.ORDER_AMOUNT.toString() : "",
+                    SALEDETAIL_DESC: item.SALEDETAIL_DESC ? item.SALEDETAIL_DESC.toString() : ""
+                  });
                 });
                 console.log('newShopListnewShopList', newShopList);
                 req = {
@@ -582,7 +616,7 @@ var _default = {
                   orderPersonTel: _this5.selectTab === 1 ? _this5.addressInfo.MOBILEPHONE : _this5.phoneNumber,
                   // couponCode: '',//优惠券
                   // t_saleorderdetail: JSON.stringify(this.shopOrder),
-                  t_saleorderdetail: JSON.stringify(newShopList),
+                  t_saleorderdetail: JSON.stringify(t_saleorderdetail),
                   recommendCode: app.globalData.recommendCode || "",
                   recommendId: app.globalData.recommendId || "",
                   requestType: "application/x-www-form-urlencoded"
@@ -595,13 +629,13 @@ var _default = {
                 console.log("this.shopOrder", _this5.shopOrder);
                 console.log("this.addressInfo", _this5.addressInfo);
                 // return
-                _context3.next = 37;
+                _context3.next = 38;
                 return _this5.$api.postCoop(req);
-              case 37:
+              case 38:
                 data = _context3.sent;
                 console.log("data", data);
                 if (!(data.ResultCode === "100")) {
-                  _context3.next = 52;
+                  _context3.next = 53;
                   break;
                 }
                 _this5$addressInfo$ME = _this5.addressInfo.MEMBERADDRESS_CODE.split(","), _this5$addressInfo$ME2 = (0, _slicedToArray2.default)(_this5$addressInfo$ME, 4), provinceId = _this5$addressInfo$ME2[0], cityId = _this5$addressInfo$ME2[1], districtId = _this5$addressInfo$ME2[2], streetId = _this5$addressInfo$ME2[3];
@@ -641,9 +675,9 @@ var _default = {
                   expect_time: "",
                   priceContentBase: priceContentBase
                 };
-                _context3.next = 47;
+                _context3.next = 48;
                 return _this5.$api.$postNode("/pino/order/submit", _req);
-              case 47:
+              case 48:
                 pingnuoData = _context3.sent;
                 console.log("pingnuoData", pingnuoData);
                 if (pingnuoData.code === 200) {
@@ -685,7 +719,7 @@ var _default = {
                   if (_this5.pageType === "UnionMall") {
                     _this5.handleBalancePayment(data.Data);
                   } else {
-                    _this5.getOrderInfo(data.Data);
+                    _this5.getOrderInfo(data.Data, data.Data.PAY_AMOUNT);
                   }
                 } else {
                   uni.showModal({
@@ -695,9 +729,9 @@ var _default = {
                   });
                   _this5.isMakeOrdering = false;
                 }
-                _context3.next = 54;
+                _context3.next = 55;
                 break;
-              case 52:
+              case 53:
                 // uni.showToast({
                 //   title: data.ResultDesc,
                 //   icon: "none",
@@ -709,7 +743,7 @@ var _default = {
                   success: function success(res) {}
                 });
                 _this5.isMakeOrdering = false;
-              case 54:
+              case 55:
               case "end":
                 return _context3.stop();
             }

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

@@ -276,10 +276,12 @@ var _default = {
       onLoadType: "",
       monthlySales: "",
       //月售
-      perCapita: '' // 人均
+      perCapita: '',
+      // 人均
+      buyType: "",
+      isFirst: true
     };
   },
-
   computed: _objectSpread({}, (0, _vuex.mapGetters)({
     //   'store': 'nowStore',
     shopcartOrder: "shopcartOrder",
@@ -754,6 +756,9 @@ var _default = {
         sellerId: id
       }).then(function (data) {
         _this.couponList = data.Result_Data.List || [];
+        if (!_this.isFirst) {
+          return;
+        }
         var tabList = [];
         var isFood = false;
         if (_this.couponList && _this.couponList.length > 0) {
@@ -780,6 +785,7 @@ var _default = {
         _this.tabList = tabList;
         _this.activeTabs = isFood ? 1 : tabList[0].value;
         console.log('_this.activeTabs_this.activeTabs', _this.activeTabs);
+        _this.isFirst = false;
         _this.$forceUpdate();
         console.log("_this.couponList", _this.couponList);
       });
@@ -803,6 +809,9 @@ var _default = {
   onReady: function onReady() {},
   onLoad: function onLoad(options) {
     console.log("optionsshop", options);
+    if (options.buyType) {
+      this.buyType = Number(options.buyType);
+    }
     this.stroreId = options.id;
     // this.merchatsMsg.MERCHANTS_ID = options.mid
     this.getShop(options.mid, options.type || 0); // 获取商户信息

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

@@ -299,6 +299,10 @@ var _default = {
   })), (0, _vuex.mapMutations)("shoppingCart", {
     setOrder: "ORDERGOOD"
   })), (0, _vuex.mapMutations)(["setInvitedCode"])), {}, {
+    // 备注的输入框
+    handleDesc: function handleDesc(e, item) {
+      this.good.SALEDETAIL_DESC = e.detail.value;
+    },
     // 收藏
     handleCollect: function handleCollect() {
       var _this2 = this;
@@ -418,6 +422,7 @@ var _default = {
     },
     // 改变当前选中的规格
     handleChangeSelectSKULIST: function handleChangeSelectSKULIST(value, obj) {
+      if (obj.COMMODITY_STOCK > 0) {
         console.log("value", value);
         // this.good.COMMODITY_RULE = value; 
         this.good.COMMODITY_RULE = obj.COMMODITY_NAME;
@@ -430,6 +435,12 @@ var _default = {
         }
         console.log("this.good", this.good);
         this.$forceUpdate();
+      } else {
+        uni.showToast({
+          title: "已售罄",
+          icon: 'error'
+        });
+      }
     },
     // 点击的锚点
     handleChangePageTab: function handleChangePageTab(value) {
@@ -527,7 +538,10 @@ var _default = {
     // 加入购物车方法
     handleAddShopCar: function handleAddShopCar() {
       var _this4 = this;
-      if (this.good.SKULIST && this.good.SKULIST.length > 0 && (this.good.COMMODITY_RULE === "默认" || !this.good.COMMODITY_RULE)) {
+      console.log('this.good', this.good);
+      if (this.good.SKULIST && this.good.SKULIST.length > 0 &&
+      // (this.good.COMMODITY_RULE === "默认" || !this.good.COMMODITY_RULE)
+      !this.good.RTCOMMODITY_MULTI_ID) {
         uni.showToast({
           title: "请先选择规格！",
           icon: "none"
@@ -580,6 +594,7 @@ var _default = {
             if (filterRuleList && filterRuleList.length > 0) {
               if (item.COMMODITY_ID === _this4.good.COMMODITY_ID) {
                 item.count = _this4.good.count + item.count;
+                item.SALEDETAIL_DESC = _this4.good.SALEDETAIL_DESC;
               }
               isSame = true;
             } else {
@@ -591,6 +606,7 @@ var _default = {
             if (item.COMMODITY_ID === _this4.good.COMMODITY_ID) {
               // item.count = this.good.count;
               item.count = _this4.good.count + item.count;
+              item.SALEDETAIL_DESC = _this4.good.SALEDETAIL_DESC;
               isSame = true;
             } else {
               // 当前购物车中找不到同样的商品 说明是新商品 那么直接添加到购物车中
@@ -845,6 +861,13 @@ var _default = {
         commodityId: id
       }).then(function (res) {
         console.log("detail", res);
+        res.Data.COMMODITY_GRADE = null;
+        res.Data.LIMIT_TOTALCOUNT = res.Data.LIMIT_TOTALCOUNT.toString();
+        res.Data.LIMIT_DAILYCOUNT = res.Data.LIMIT_DAILYCOUNT.toString();
+        res.Data.REMINDER_DAY = res.Data.REMINDER_DAY.toString();
+        res.Data.SEND_MODE = res.Data.SEND_MODE.toString();
+        res.Data.AFTERSALE_NATRUE = res.Data.AFTERSALE_NATRUE.toString();
+        res.Data.DUTY_PARAGRAPH = res.Data.DUTY_PARAGRAPH.toString();
         _this.good = res.Data;
         _this.good.COMMODITY_CURRPRICE = _this.good.COMMODITY_MEMBERPRICE;
         _this.good.count = 1;

unpackage/dist/dev/mp-weixin/pages/shopPages/shopDetail/index.wxss

@@ -750,6 +750,8 @@ button.data-v-0dc4ca38:after {
   width: 100%;
   height: 80rpx;
   box-sizing: border-box;
+  position: relative;
+  z-index: 9;
 }
 .shopPopupBox .bottomBtn .shopCarBtn.data-v-0dc4ca38 {
   width: 100%;

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

@@ -242,7 +242,12 @@ var _default = {
       chargingObj: {},
       inShop: 0,
       // 判断是否在商城里面
-      shopCarListCount: 0 // 购物车商品数量
+      shopCarListCount: 0,
+      // 购物车商品数量
+      showErrorText: "",
+      mallOrderCountList: [0, 0, 0],
+      // 商城订单的数量
+      foodOrderCountList: [0, 0, 0] // 点餐订单的数量
     };
   },
   onLoad: function onLoad() {
@@ -272,25 +277,29 @@ var _default = {
               // if (!this.user.MEMBERSHIP_ID) {
               //   uni.navigateTo({ url: "/pages/register/index" });
               // }
-              // 拿车牌号
+
+              // 拿用户信息
               _context.next = 6;
-              return _this2.handleGetCarCode();
+              return _this2.handleGetUserDetail();
             case 6:
               _context.next = 8;
-              return _this2.handleGetUserDetail();
+              return _this2.handleGetOrderDetail();
             case 8:
+              _context.next = 10;
+              return _this2.handleGetCarCode();
+            case 10:
               seatInfo = uni.getStorageSync("seatInfo");
               if (seatInfo) {
                 _this2.seat = JSON.parse(seatInfo);
               }
               currentService = uni.getStorageSync("currentService");
               if (!currentService) {
-                _context.next = 18;
+                _context.next = 20;
                 break;
               }
-              _context.next = 14;
+              _context.next = 16;
               return _this2.handleGetServiceDetail(currentService.SERVERPART_ID);
-            case 14:
+            case 16:
               obj = _this2.handleMergeDetail(currentService);
               newObj = _objectSpread(_objectSpread({}, currentService), {}, {
                 sumDetail: obj,
@@ -303,7 +312,7 @@ var _default = {
               });
               _this2.serviceDetail = newObj;
               _this2.handleGetChargingStation(_this2.serviceDetail);
-            case 18:
+            case 20:
               if (_this2.inShop === 2 || _this2.inShop === 1) {
                 // 判断当前的购物车里面是否有东西
                 shopCarList = [];
@@ -321,7 +330,7 @@ var _default = {
                 }
                 _this2.shopCarListCount = count;
               }
-            case 19:
+            case 21:
             case "end":
               return _context.stop();
           }
@@ -638,6 +647,7 @@ var _default = {
             switch (_context5.prev = _context5.next) {
               case 0:
                 _this = _this5;
+                _this.showErrorText = 1;
                 uni.uploadFile({
                   url: "https://api.eshangtech.com/EShangApiMain/Picture/UploadPicture",
                   // 你的接口 URL
@@ -658,7 +668,7 @@ var _default = {
                               data = uploadRes.data ? JSON.parse(uploadRes.data) : "";
                               url = data.Result_Data.ImageUrl;
                               if (!url) {
-                                _context4.next = 9;
+                                _context4.next = 10;
                                 break;
                               }
                               req = {
@@ -666,14 +676,15 @@ var _default = {
                                 headImgUrl: url
                               };
                               _this.WXProfile = url;
-                              _context4.next = 7;
+                              _this.showErrorText = _this.WXProfile;
+                              _context4.next = 8;
                               return _this.$api.$get("/WeChat/UpdateMemberInfo", req);
-                            case 7:
+                            case 8:
                               userInfoData = _context4.sent;
                               if (userInfoData.Result_Code === 100) {
                                 _this.handleGetUserDetail();
                               }
-                            case 9:
+                            case 10:
                             case "end":
                               return _context4.stop();
                           }
@@ -684,9 +695,12 @@ var _default = {
                       return _success.apply(this, arguments);
                     }
                     return success;
-                  }()
+                  }(),
+                  fail: function fail(error) {
+                    _this.showErrorText = JSON.stringify(error);
+                  }
                 });
-              case 2:
+              case 3:
               case "end":
                 return _context5.stop();
             }
@@ -698,22 +712,43 @@ var _default = {
     handleGetUserDetail: function handleGetUserDetail() {
       var _this6 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
-        var userData;
+        var _this;
         return _regenerator.default.wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
-                _context6.next = 2;
+                _this = _this6;
-                return _this6.$api.getCoop({
+                _this.$api.getCoop({
                   action_type: "GetMembershipInfo",
-                  WechatUserId: _this6.user.WechatUserId
+                  WechatUserId: _this.user.WechatUserId
+                }).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 || "";
+                    _this.user.MEMBERSHIP_LEVEL_TEXT = _data.Data.MEMBERSHIP_LEVEL_TEXT || "";
+                    _this.user.COUPON_COUNT = _data.Data.COUPON_COUNT || "";
+                    _this.user.PENDORDER_COUNT = _data.Data.PENDORDER_COUNT || "";
+                    _this.user.RESERVATION_COUNT = _data.Data.RESERVATION_COUNT || "";
+                    _this.user.ACCOUNT_BALANCE = _data.Data.ACCOUNT_BALANCE || "";
+                    _this.user.ISPLUS = _data.Data.ISPLUS || "";
+                    _this.user.INDUSTRY_MEMBERSHIP_ID = _data.Data.INDUSTRY_MEMBERSHIP_ID || "";
+                    _this.user.MEMBERSHIP_TYPE = _data.Data.MEMBERSHIP_TYPE || "";
+                    _this.user.MEMBERSHIP_LEVEL = _data.Data.MEMBERSHIP_LEVEL || "";
+                    _this.user.InviteCode = _data.Data.InviteCode || "";
+                    _this.user.MEMBERSHIP_POINT = _data.Data.MEMBERSHIP_POINT || "";
+                    _this.user.MEMBERSHIP_MOBILEPHONE = _data.Data.MEMBERSHIP_MOBILEPHONE || "";
+                    _this.WXProfile = _data.Data.MEMBERSHIP_HEADIMAGEURL;
+                    _this.$store.commit("setUser", _this.user);
+                    _this.$forceUpdate();
+                  } else {
+                    // _this.setUser({});
+                    _this.$store.commit("setUser", user);
+                  }
                 });
               case 2:
-                userData = _context6.sent;
-                _this6.userInfo = userData.Data;
-                _this6.$forceUpdate();
-                console.log("this.userInfo", _this6.userInfo);
-              case 6:
               case "end":
                 return _context6.stop();
             }
@@ -898,6 +933,120 @@ var _default = {
       uni.navigateTo({
         url: "/pages/useConfig/FavoriteStore"
       });
+    },
+    handleGetOrderDetail: function handleGetOrderDetail() {
+      var _this9 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
+        var req, data, list, obligation, pendingShipment, pendingReceiptOfGoods, mallOrderCountList, reqFood, dataFood, _list, _obligation, _pendingShipment, _pendingReceiptOfGoods, foodOrderCountList, foodTab;
+        return _regenerator.default.wrap(function _callee9$(_context9) {
+          while (1) {
+            switch (_context9.prev = _context9.next) {
+              case 0:
+                // 商城订单数据
+                req = {
+                  action_type: "GetMallOrderList",
+                  salebillType: '3000,3001,3002,3999',
+                  salebillState: "",
+                  PageIndex: 1,
+                  pageSize: 99999,
+                  ownerUnitId: 911,
+                  requestType: "application/x-www-form-urlencoded"
+                };
+                _context9.next = 3;
+                return _this9.$api.postCoop(req);
+              case 3:
+                data = _context9.sent;
+                console.log('商城订单', data);
+                if (data.ResultCode === "100") {
+                  list = data.Data.List; // 待付款
+                  obligation = []; // 待发货
+                  pendingShipment = []; // 待收货
+                  pendingReceiptOfGoods = [];
+                  if (list && list.length > 0) {
+                    list.forEach(function (item) {
+                      if (item.SALEBILL_STATE === 1005) {
+                        obligation.push(item);
+                      } else if (item.SALEBILL_STATE === 1010) {
+                        pendingShipment.push(item);
+                      } else if (item.SALEBILL_STATE === 2010) {
+                        pendingReceiptOfGoods.push(item);
+                      }
+                    });
+                  }
+                  mallOrderCountList = [obligation && obligation.length > 0 ? obligation.length : 0, pendingShipment && pendingShipment.length > 0 ? pendingShipment.length : 0, pendingReceiptOfGoods && pendingReceiptOfGoods.length > 0 ? pendingReceiptOfGoods.length : 0];
+                  _this9.mallOrderCountList = mallOrderCountList;
+                } else {
+                  _this9.mallOrderCountList - [0, 0, 0];
+                }
+                reqFood = {
+                  action_type: "GetOrderList",
+                  salebillType: 6000,
+                  salebillState: "",
+                  PageIndex: 1,
+                  pageSize: 99999,
+                  ownerUnitId: 911,
+                  requestType: "application/x-www-form-urlencoded"
+                };
+                _context9.next = 9;
+                return _this9.$api.postCoop(reqFood);
+              case 9:
+                dataFood = _context9.sent;
+                console.log('点餐订单', dataFood);
+                if (dataFood.ResultCode === "100") {
+                  _list = dataFood.Data.List; // 待付款
+                  _obligation = []; // 待接单
+                  _pendingShipment = []; // 制作中
+                  _pendingReceiptOfGoods = [];
+                  if (_list && _list.length > 0) {
+                    _list.forEach(function (item) {
+                      if (item.SALEBILL_STATE === 1005) {
+                        _obligation.push(item);
+                      } else if (item.SALEBILL_STATE === 1010) {
+                        _pendingShipment.push(item);
+                      } else if (item.SALEBILL_STATE === 2000) {
+                        _pendingReceiptOfGoods.push(item);
+                      }
+                    });
+                  }
+                  foodOrderCountList = [_obligation && _obligation.length > 0 ? _obligation.length : 0, _pendingShipment && _pendingShipment.length > 0 ? _pendingShipment.length : 0, _pendingReceiptOfGoods && _pendingReceiptOfGoods.length > 0 ? _pendingReceiptOfGoods.length : 0]; // this.foodOrderCountList = foodOrderCountList
+                  foodTab = JSON.parse(JSON.stringify(_this9.foodFunList));
+                  foodTab.forEach(function (item) {
+                    if (item.value === 1) {
+                      item.orderCount = _obligation && _obligation.length > 0 ? _obligation.length : 0;
+                    } else if (item.value === 2) {
+                      item.orderCount = _pendingShipment && _pendingShipment.length > 0 ? _pendingShipment.length : 0;
+                    } else if (item.value === 3) {
+                      item.orderCount = _pendingReceiptOfGoods && _pendingReceiptOfGoods.length > 0 ? _pendingReceiptOfGoods.length : 0;
+                    }
+                  });
+                  _this9.foodFunList = foodTab;
+                } else {
+                  _this9.foodFunList = [{
+                    label: "待付款",
+                    value: 1,
+                    src: "/static/images/home/obligationIcon.svg"
+                  }, {
+                    label: "待接单",
+                    value: 2,
+                    src: "/static/images/home/shipmentIcon.svg"
+                  }, {
+                    label: "制作中",
+                    value: 3,
+                    src: "/static/images/home/receiptOfGoods.svg"
+                  }, {
+                    label: "待评价",
+                    value: 4,
+                    src: "/static/images/home/evaluatedIcon.svg"
+                  }];
+                }
+                _this9.$forceUpdate();
+              case 13:
+              case "end":
+                return _context9.stop();
+            }
+          }
+        }, _callee9);
+      }))();
     }
   }
 };

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

@@ -250,6 +250,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
+  position: relative;
 }
 .main .pageContent .userOrder .userOrderBottom .userOrderBottomItem .userOrderBottomItemImg.data-v-137d5072 {
   width: 44rpx;
@@ -265,6 +266,16 @@
   text-align: right;
   font-style: normal;
 }
+.main .pageContent .userOrder .userOrderBottom .userOrderBottomItem .orderCount.data-v-137d5072 {
+  position: absolute;
+  top: -10rpx;
+  right: 10rpx;
+  color: #fff;
+  background-color: red;
+  border-radius: 50%;
+  padding: 0rpx 8rpx;
+  font-size: 20rpx;
+}
 .main .pageContent .oftenFunBox.data-v-137d5072 {
   width: 100%;
   margin-top: 24rpx;
@@ -615,6 +626,7 @@
   display: flex;
   flex-direction: column;
   align-items: center;
+  position: relative;
 }
 .main .pageContent .orderFun .orderContent .orderLeft .orderFunItem .orderFunIcon.data-v-137d5072,
 .main .pageContent .orderFun .orderContent .newOrderLeft .orderFunItem .orderFunIcon.data-v-137d5072 {
@@ -632,6 +644,17 @@
   text-align: left;
   font-style: normal;
 }
+.main .pageContent .orderFun .orderContent .orderLeft .orderFunItem .orderCount.data-v-137d5072,
+.main .pageContent .orderFun .orderContent .newOrderLeft .orderFunItem .orderCount.data-v-137d5072 {
+  position: absolute;
+  right: -10rpx;
+  top: -10rpx;
+  color: #fff;
+  background-color: red;
+  border-radius: 50%;
+  padding: 0rpx 8rpx;
+  font-size: 20rpx;
+}
 .main .pageContent .orderFun .orderContent .orderLeft.data-v-137d5072::after {
   content: "";
   width: 2rpx;