update

pages/order/foodOrder/index.vue

@@ -27,38 +27,20 @@
       </div> -->
 
       <div class="tabs">
-        <div
+        <div class="tabs_item" :class="currentTab === item.value ? 'tab_active' : ''" v-for="(item, idx) in tabList"
-          class="tabs_item"
+          :key="idx" @click="handleTab(item.value)">
-          :class="currentTab === item.value ? 'tab_active' : ''"
-          v-for="(item, idx) in tabList"
-          :key="idx"
-          @click="handleTab(item.value)"
-        >
           {{ item.label }}
         </div>
       </div>
 
       <div class="sum_count" v-if="TotalCount > 0">
-        共<span>{{ TotalCount }}</span
+        共<span>{{ TotalCount }}</span>笔订单, 合计<span>{{ TotalAmount }}</span>元
-        >笔订单, 合计<span>{{ TotalAmount }}</span
-        >元
       </div>
     </div>
 
-    <scroll-view
+    <scroll-view v-if="orderList && orderList.length > 0" class="srcollView" scroll-y="true" refresher-enabled="true"
-      v-if="orderList && orderList.length > 0"
+      @refresherrefresh="handleRefresherrefresh" :refresher-triggered="triggered" @scrolltolower="handleScrollTolower">
-      class="srcollView"
+      <div @click="goEvaluate(item)" v-for="(item, idx) in orderList" :key="idx">
-      scroll-y="true"
-      refresher-enabled="true"
-      @refresherrefresh="handleRefresherrefresh"
-      :refresher-triggered="triggered"
-      @scrolltolower="handleScrollTolower"
-    >
-      <div
-        @click="goEvaluate(item)"
-        v-for="(item, idx) in orderList"
-        :key="idx"
-      >
         <OrderItem :obj="item" @handleGetOrderList="handleGetOrderList" />
       </div>
       <view class="inBottom">
@@ -71,8 +53,6 @@
   </view>
 </template>
 
-</view>
-</template>
 <script>
 import NoData from "../../../components/noData.vue";
 import OrderItem from "./components/orderItem.vue";
@@ -125,14 +105,14 @@ export default {
       this.currentTab === 1
         ? ""
         : this.currentTab === 2
-        ? "1005"
+          ? "1005"
-        : this.currentTab === 3
+          : this.currentTab === 3
-        ? "1010"
+            ? "1010"
-        : this.currentTab === 4
+            : this.currentTab === 4
-        ? "2000"
+              ? "2000"
-        : this.currentTab === 5
+              : this.currentTab === 5
-        ? ""
+                ? "3000"
-        : "";
+                : "";
     // 获取订单数据
     this.handleGetOrderList(type);
     this.$utils.addUserBehaviorNew();
@@ -145,14 +125,14 @@ export default {
         this.currentTab === 1
           ? ""
           : this.currentTab === 2
-          ? "1005"
+            ? "1005"
-          : this.currentTab === 3
+            : this.currentTab === 3
-          ? "1010,2000"
+              ? "1010"
-          : this.currentTab === 4
+              : this.currentTab === 4
-          ? "2010"
+                ? "2000"
-          : this.currentTab === 5
+                : this.currentTab === 5
-          ? ""
+                  ? "3000"
-          : "";
+                  : "";
       this.handleGetOrderList(type);
     },
     // 下拉刷新的方法
@@ -168,14 +148,14 @@ export default {
         this.currentTab === 1
           ? ""
           : this.currentTab === 2
-          ? "1005"
+            ? "1005"
-          : this.currentTab === 3
+            : this.currentTab === 3
-          ? "1010,2000"
+              ? "1010,2000"
-          : this.currentTab === 4
+              : this.currentTab === 4
-          ? "2010"
+                ? "2010"
-          : this.currentTab === 5
+                : this.currentTab === 5
-          ? ""
+                  ? ""
-          : "";
+                  : "";
       await this.handleGetOrderList(type);
       this.triggered = false;
     },
@@ -189,17 +169,17 @@ export default {
       this.currentTab = val;
       this.orderList = [];
       let type =
-        val === 1
+        this.currentTab === 1
           ? ""
-          : val === 2
+          : this.currentTab === 2
-          ? "1005"
+            ? "1005"
-          : val === 3
+            : this.currentTab === 3
-          ? "1010"
+              ? "1010"
-          : val === 4
+              : this.currentTab === 4
-          ? "2000"
+                ? "2000"
-          : val === 5
+                : this.currentTab === 5
-          ? ""
+                  ? "3000"
-          : "";
+                  : "";
       this.handleGetOrderList(type);
     },
     // 获取订单数据
@@ -258,13 +238,13 @@ export default {
       uni.navigateTo({
         url:
           "/pages/order/orderFoodDetail/index?sellchildid=" +
-          item.SALEBILL_CHILD_ID +
+          (item.SALEBILL_CHILD_ID || "") +
           "&orderInternal=" +
-          item.SALEBILL_ID +
+          (item.SALEBILL_ID || "") +
           "&orderStatus=" +
-          item.SALEBILL_STATE +
+          (item.SALEBILL_STATE || "") +
           "&SUPPLIER_NAME=" +
-          item.SUPPLIER_NAME,
+          (item.SUPPLIER_NAME || ""),
       });
     },
   },
@@ -373,14 +353,17 @@ export default {
       }
     }
   }
+
   .srcollView {
     width: 100%;
     height: calc(100vh - 160rpx);
+
     .inBottom {
       width: 100%;
       display: flex;
       align-items: center;
       justify-content: center;
+
       .bottomText {
         font-family: PingFangSC, PingFang SC;
         font-weight: 400;
@@ -392,6 +375,7 @@ export default {
         position: relative;
         padding: 6rpx 0;
       }
+
       .bottomText::after {
         content: "";
         width: 30vw;
@@ -401,6 +385,7 @@ export default {
         left: -32vw;
         top: 50%;
       }
+
       .bottomText::before {
         content: "";
         width: 30vw;

pages/order/orderFoodDetail/index.vue

@@ -6,24 +6,24 @@
           orderInfo.SALEBILL_STATE === 1010
             ? "待接单"
             : orderInfo.SALEBILL_STATE === 2000
-            ? "制作中"
+              ? "制作中"
-            : orderInfo.SALEBILL_STATE === 2010
+              : orderInfo.SALEBILL_STATE === 2010
-            ? "已完成"
+                ? "已完成"
-            : orderInfo.SALEBILL_STATE === 8000
+                : orderInfo.SALEBILL_STATE === 8000
-            ? "退款申请中"
+                  ? "退款申请中"
-            : orderInfo.SALEBILL_STATE === 8010
+                  : orderInfo.SALEBILL_STATE === 8010
-            ? "商品退货中"
+                    ? "商品退货中"
-            : orderInfo.SALEBILL_STATE === 8020
+                    : orderInfo.SALEBILL_STATE === 8020
-            ? "退款处理中"
+                      ? "退款处理中"
-            : orderInfo.SALEBILL_STATE === 8900
+                      : orderInfo.SALEBILL_STATE === 8900
-            ? "订单已退款"
+                        ? "订单已退款"
-            : orderInfo.SALEBILL_STATE === 8999
+                        : orderInfo.SALEBILL_STATE === 8999
-            ? "退款已关闭"
+                          ? "退款已关闭"
-            : orderInfo.SALEBILL_STATE === 9000
+                          : orderInfo.SALEBILL_STATE === 9000
-            ? "订单已关闭"
+                            ? "订单已关闭"
-            : orderInfo.SALEBILL_STATE === 9999
+                            : orderInfo.SALEBILL_STATE === 9999
-            ? "订单已撤销"
+                              ? "订单已撤销"
-            : ""
+                              : ""
         }}
       </div>
       <div class="status-btn-box">
@@ -33,26 +33,20 @@
             去付款 <span>{{ minutes }}</span>
           </div>
         </block>
-        <block
+        <block v-if="
-          v-if="
+          orderInfo.SALEBILL_STATE !== 1005 &&
-            orderInfo.SALEBILL_STATE !== 1005 &&
+          orderInfo.SALEBILL_STATE !== 8000 &&
-            orderInfo.SALEBILL_STATE !== 8000 &&
+          orderInfo.SALEBILL_STATE !== 8010 &&
-            orderInfo.SALEBILL_STATE !== 8010 &&
+          orderInfo.SALEBILL_STATE !== 8020 &&
-            orderInfo.SALEBILL_STATE !== 8020 &&
+          orderInfo.SALEBILL_STATE !== 8900 &&
-            orderInfo.SALEBILL_STATE !== 8900 &&
+          orderInfo.SALEBILL_STATE !== 8999 &&
-            orderInfo.SALEBILL_STATE !== 8999 &&
+          orderInfo.SALEBILL_STATE !== 9000 &&
-            orderInfo.SALEBILL_STATE !== 9000 &&
+          orderInfo.SALEBILL_STATE !== 9999
-            orderInfo.SALEBILL_STATE !== 9999 &&
+        ">
-            orderInfo.COMMENT_STATE === 0
+          <!-- && orderInfo.COMMENT_STATE === 0 -->
-          "
+          <div class="continu-btn" @click="handleRefund" v-if="orderInfo.SALEBILL_STATE === 1010">发起退款</div>
-        >
-          <!-- <div class="continu-btn" @click="handleRefund">发起退款</div> -->
           <!-- <div class="back-btn" @click="goShop" v-if="orderInfo.SALEBILL_STATE!=1010">再来一单</div> -->
-          <div
+          <div v-if="orderInfo.COMMENT_STATE !== 1" class="continu-btn" @click="goEvaluate">
-            v-if="orderInfo.COMMENT_STATE !== 1"
-            class="continu-btn"
-            @click="goEvaluate"
-          >
             评价得积分
           </div>
         </block>
@@ -68,26 +62,21 @@
         }}</span>
       </p>
       <p class="order-info-type">
-        <span class="order-info-t">订单编号</span
+        <span class="order-info-t">订单编号</span><span>{{ orderInfo.SALEBILL_CODE }}</span>
-        ><span>{{ orderInfo.SALEBILL_CODE }}</span>
       </p>
 
       <p class="order-info-type">
-        <span class="order-info-t">下单时间</span
+        <span class="order-info-t">下单时间</span><span>{{ orderInfo.ORDER_DATE }}</span>
-        ><span>{{ orderInfo.ORDER_DATE }}</span>
       </p>
       <block v-if="orderInfo.TAKE_TYPE === 2000">
         <p class="order-info-type">
-          <span class="order-info-t">下单人员</span
+          <span class="order-info-t">下单人员</span><span>{{ orderInfo.ORDER_PERSON }}</span>
-          ><span>{{ orderInfo.ORDER_PERSON }}</span>
         </p>
         <p class="order-info-type">
-          <span class="order-info-t">预约时间</span
+          <span class="order-info-t">预约时间</span><span>{{ orderInfo.RESERVATION_DATE }}</span>
-          ><span>{{ orderInfo.RESERVATION_DATE }}</span>
         </p>
         <p class="order-info-type">
-          <span class="order-info-t">预约电话</span
+          <span class="order-info-t">预约电话</span><span>{{ orderInfo.ORDER_PERSONTEL }}</span>
-          ><span>{{ orderInfo.ORDER_PERSONTEL }}</span>
         </p>
       </block>
     </div>
@@ -95,15 +84,12 @@
     <div class="order-box">
       <div class="order-top" @click="goShop">
         <div style="display: flex; align-items: center">
-          <img
+          <img src="https://eshangtech.com/ShopICO/shop_ico.png" style="
-            src="https://eshangtech.com/ShopICO/shop_ico.png"
-            style="
               width: 56rpx;
               height: 36rpx;
               vertical-align: middle;
               margin-right: 10rpx;
-            "
+            " />
-          />
           <span class="order-addr">{{ ShopAddress }}</span>
         </div>
         <van-icon name="arrow" size="30rpx" v-if="pageMsg.type === 0" />
@@ -133,12 +119,7 @@
       </div>
       <div class="price-sum">
         <div class="link-store" @click="callPhone">
-          <van-icon
+          <van-icon name="phone-circle-o" size="40rpx" color="#CAA97F" custom-style="margin-right:16rpx;"></van-icon>
-            name="phone-circle-o"
-            size="40rpx"
-            color="#CAA97F"
-            custom-style="margin-right:16rpx;"
-          ></van-icon>
           联系商家
         </div>
         <div class="">
@@ -154,42 +135,23 @@
 
         <div class="payList">
           <radio-group :value="payType" class="radio-group">
-            <div
+            <div class="bottom-radio" color="#CAA97F" @click="handleChangePayType(1)">
-              class="bottom-radio"
-              color="#CAA97F"
-              @click="handleChangePayType(1)"
-            >
               <div class="radioLeft">
                 <div class="logoBox">
-                  <image
+                  <image class="logoIcon" src="/static/images/home/alipayIcon.png" />
-                    class="logoIcon"
-                    src="/static/images/home/alipayIcon.png"
-                  />
                 </div>
                 <text>支付宝支付</text>
               </div>
-              <radio
+              <radio value="支付宝支付" color="#CAA97F" :checked="payType === 1" />
-                value="支付宝支付"
-                color="#CAA97F"
-                :checked="payType === 1"
-              />
             </div>
-            <div
+            <div class="bottom-radio" color="#CAA97F" @click="handleChangePayType(2)">
-              class="bottom-radio"
-              color="#CAA97F"
-              @click="handleChangePayType(2)"
-            >
               <div class="radioLeft">
                 <div class="logoBox">
                   <image class="logoIcon" src="/static/images/home/wxPay.png" />
                 </div>
                 <text>微信支付</text>
               </div>
-              <radio
+              <radio value="微信支付" color="#CAA97F" :checked="payType === 2" />
-                value="微信支付"
-                color="#CAA97F"
-                :checked="payType === 2"
-              />
             </div>
           </radio-group>
         </div>
@@ -265,7 +227,7 @@ export default {
               provinceCode: _this.user.PROVINCE_CODE || "530000",
               serverpartShopId: "5634",
               salebillDesc: "退款订单",
-              wechatOpenId: openId || "",
+              wechatOpenId: _this.user.WECHATAPP_OPENID || "",
               wechatUnionId: _this.user.USER_UNIONID || "",
               // addressId: this.addressInfo.MEMBERADDRESS_ID,
               // orderPersonTel: this.addressInfo.MOBILEPHONE,
@@ -278,7 +240,7 @@ export default {
               const req = {
                 action_type: "UpdateOrderState",
                 action_data: _this.orderInfo.SALEBILL_ID,
-                saleBillChildId: _this.sellchildid,
+                saleBillChildId: _this.sellchildid || "",
                 SALEBILL_STATE: 8000,
                 // deliverDate: new Date()
               };
@@ -386,12 +348,12 @@ export default {
       };
       console.log(
         "POST\n/v3/pay/transactions/jsapi\n" +
-          timeStamp +
+        timeStamp +
-          "\n" +
+        "\n" +
-          nonceStr +
+        nonceStr +
-          "\n" +
+        "\n" +
-          JSON.stringify(req) +
+        JSON.stringify(req) +
-          "\n"
+        "\n"
       );
 
       const data = await this.$api.$get("/WeChat/GenerateSign", reqSign);
@@ -674,7 +636,7 @@ export default {
                 // })
               }
             },
-            complete(res) {},
+            complete(res) { },
           });
         } else {
           uni.showToast({
@@ -1064,7 +1026,7 @@ hr {
   justify-content: space-between;
 }
 
-.order-info-type + .order-info-type {
+.order-info-type+.order-info-type {
   border-top: 1px solid #f5f5f5;
 }
 

pages/shopPages/shopDetail/index.vue

@@ -230,8 +230,8 @@
       </div>
       <div class="detail-image-box">
         <block v-for="(img, i) in good.ContentImgList" :key="i" v-show="detailImgList[i]">
-          <image class="img" mode="aspectFill" lazy-load="true" :src="img.IMAGE_URL" @load="loadDetailImg($event, i)"
+          <image mode="widthFix" class="img" lazy-load="true" :src="img.IMAGE_URL" @load="loadDetailImg($event, i)"
-            @click="handlePreviewDetailImg(img)"></image>
+            @click="handlePreviewDetailImg(img, good.ContentImgList)"></image>
           <!-- :style="
                 'width:' +
                 detailImgList[i].width +
@@ -567,14 +567,19 @@ export default {
       });
     },
     // 预览详情图片
-    handlePreviewDetailImg(obj) {
+    handlePreviewDetailImg(obj, list) {
       console.log("obj", obj);
       let imgList = [];
-      if (this.good.List && this.good.List.length > 0) {
+      if (list && list.length > 0) {
-        this.good.List.forEach((item) => {
+        imgList = list
-          imgList.push(item.IMAGE_URL);
+      } else {
-        });
+        if (this.good.List && this.good.List.length > 0) {
+          this.good.List.forEach((item) => {
+            imgList.push(item.IMAGE_URL);
+          });
+        }
       }
+
       uni.previewImage({
         current: obj.IMAGE_URL, // 当前显示图片的http链接
         urls: imgList, // 需要预览的图片http链接列表

unpackage/dist/dev/mp-weixin/components/currentService.json

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

unpackage/dist/dev/mp-weixin/components/keyboard.json

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

unpackage/dist/dev/mp-weixin/components/noData.json

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

unpackage/dist/dev/mp-weixin/components/shopTabbar.json

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

unpackage/dist/dev/mp-weixin/components/tabbar.json

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

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

@@ -202,7 +202,7 @@ var _default = {
       this.searchType = query.type;
       this.currentTab = Number(this.searchType) + 1;
     }
-    var type = this.currentTab === 1 ? "" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010" : this.currentTab === 4 ? "2000" : this.currentTab === 5 ? "" : "";
+    var type = this.currentTab === 1 ? "" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010" : this.currentTab === 4 ? "2000" : this.currentTab === 5 ? "3000" : "";
     // 获取订单数据
     this.handleGetOrderList(type);
     this.$utils.addUserBehaviorNew();
@@ -211,7 +211,7 @@ var _default = {
     // 滚动到底部 加载更多
     handleScrollTolower: function handleScrollTolower() {
       this.pageMsg.pageIndex = this.pageMsg.pageIndex + 1;
-      var type = this.currentTab === 1 ? "" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010,2000" : this.currentTab === 4 ? "2010" : this.currentTab === 5 ? "" : "";
+      var type = this.currentTab === 1 ? "" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010" : this.currentTab === 4 ? "2000" : this.currentTab === 5 ? "3000" : "";
       this.handleGetOrderList(type);
     },
     // 下拉刷新的方法
@@ -251,7 +251,7 @@ var _default = {
       };
       this.currentTab = val;
       this.orderList = [];
-      var type = val === 1 ? "" : val === 2 ? "1005" : val === 3 ? "1010" : val === 4 ? "2000" : val === 5 ? "" : "";
+      var type = this.currentTab === 1 ? "" : this.currentTab === 2 ? "1005" : this.currentTab === 3 ? "1010" : this.currentTab === 4 ? "2000" : this.currentTab === 5 ? "3000" : "";
       this.handleGetOrderList(type);
     },
     // 获取订单数据
@@ -322,7 +322,7 @@ var _default = {
     goEvaluate: function goEvaluate(item) {
       console.log("item", item);
       uni.navigateTo({
-        url: "/pages/order/orderFoodDetail/index?sellchildid=" + item.SALEBILL_CHILD_ID + "&orderInternal=" + item.SALEBILL_ID + "&orderStatus=" + item.SALEBILL_STATE + "&SUPPLIER_NAME=" + item.SUPPLIER_NAME
+        url: "/pages/order/orderFoodDetail/index?sellchildid=" + (item.SALEBILL_CHILD_ID || "") + "&orderInternal=" + (item.SALEBILL_ID || "") + "&orderStatus=" + (item.SALEBILL_STATE || "") + "&SUPPLIER_NAME=" + (item.SUPPLIER_NAME || "")
       });
     }
   }

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

@@ -241,7 +241,7 @@ var _default = {
                       provinceCode: _this.user.PROVINCE_CODE || "530000",
                       serverpartShopId: "5634",
                       salebillDesc: "退款订单",
-                      wechatOpenId: openId || "",
+                      wechatOpenId: _this.user.WECHATAPP_OPENID || "",
                       wechatUnionId: _this.user.USER_UNIONID || "",
                       // addressId: this.addressInfo.MEMBERADDRESS_ID,
                       // orderPersonTel: this.addressInfo.MOBILEPHONE,
@@ -260,7 +260,7 @@ var _default = {
                     req = {
                       action_type: "UpdateOrderState",
                       action_data: _this.orderInfo.SALEBILL_ID,
-                      saleBillChildId: _this.sellchildid,
+                      saleBillChildId: _this.sellchildid || "",
                       SALEBILL_STATE: 8000
                       // deliverDate: new Date()
                     };

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

@@ -383,13 +383,17 @@ var _default = {
       });
     },
     // 预览详情图片
-    handlePreviewDetailImg: function handlePreviewDetailImg(obj) {
+    handlePreviewDetailImg: function handlePreviewDetailImg(obj, list) {
       console.log("obj", obj);
       var imgList = [];
-      if (this.good.List && this.good.List.length > 0) {
+      if (list && list.length > 0) {
-        this.good.List.forEach(function (item) {
+        imgList = list;
-          imgList.push(item.IMAGE_URL);
+      } else {
-        });
+        if (this.good.List && this.good.List.length > 0) {
+          this.good.List.forEach(function (item) {
+            imgList.push(item.IMAGE_URL);
+          });
+        }
       }
       uni.previewImage({
         current: obj.IMAGE_URL,