update

pages/index/index.vue

@@ -417,6 +417,11 @@
       <image class="backIcon" src="/static/images/home/backTopIcon.png" />
     </view>
 
+    <!-- 广告 -->
+    <uni-popup ref="noticeRef">
+      <view class="noticePopup" @click="handleHidePopup"> </view>
+    </uni-popup>
+
     <tabbar :page="'/pages/index/index'" />
   </view>
 </template>
@@ -565,9 +570,19 @@ export default {
       safeHeight: 0, // ios的安全距离
       showBackTop: false, // 页面滚动距离
       scrollView: "",
+      showPoster: true, // 判断是否显示海报
     };
   },
   async onLoad() {
+    let stronge = uni.getStorageSync("showIndexPoster");
+    console.log("stronge", stronge);
+
+    if (stronge === 1 || stronge === "1") {
+      this.showPoster = false;
+    } else {
+      this.$refs.noticeRef.open("center");
+    }
+
     this.menu = uni.getMenuButtonBoundingClientRect();
     let systemInfo = uni.getSystemInfoSync();
     console.log("systemInfo", systemInfo);
@@ -666,6 +681,14 @@ export default {
     };
   },
   methods: {
+    handleHidePopup() {
+      uni.setStorageSync("showIndexPoster", 1);
+      this.$refs.noticeRef.close();
+      uni.navigateTo({
+        url: `/pages/shopMallPage/shopType/index`,
+      });
+
+    },
     // 回到顶部
     handleGoBack() {
       this.scrollView = "navItem";
@@ -1937,6 +1960,18 @@ export default {
     color: transparent;
   }
 
+  .noticePopup {
+    width: 70vw;
+    height: calc(2688 * 70vw / 1242);
+    background: #fff;
+    border-radius: 32rpx;
+    background-image: url(https://eshangtech.com/minTestImg/preSalePoster.jpg);
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    box-sizing: border-box;
+    padding: 300rpx 120rpx 160rpx;
+  }
+
   .backTopBox {
     width: 40px;
     height: 40px;

pages/order/orderdetail/index.vue

@@ -90,6 +90,14 @@
             : ""
         }}</span>
       </p>
+      <p
+        class="order-info-type"
+        v-if="orderInfo.TAKE_TYPE === 2000 && orderInfo.SALEBILL_STATE >= 2010"
+      >
+        <span class="order-info-t">快递单号</span
+        ><span>{{ orderInfo.TABLE_NUMBER || "" }}</span>
+      </p>
+
       <p class="order-info-type">
         <span class="order-info-t">订单编号</span
         ><span>{{ orderInfo.SALEBILL_CODE }}</span>

pages/shopMallPage/index/index.vue

@@ -55,12 +55,25 @@
             height:
               shopTypeList.length < 5
                 ? '144rpx'
+                : shopTypeList.length === 5
+                ? Math.ceil(6 / 5) * 144 +
+                  (Math.ceil(6 / 5) - 1) * 42 +
+                  60 +
+                  'rpx'
                 : Math.ceil(shopTypeList.length / 5) * 144 +
                   (Math.ceil(shopTypeList.length / 5) - 1) * 42 +
                   60 +
                   'rpx',
           }"
         >
+          <!-- height:
+              shopTypeList.length < 5
+                ? '144rpx'
+                : Math.ceil(shopTypeList.length / 5) * 144 +
+                  (Math.ceil(shopTypeList.length / 5) - 1) * 42 +
+                  60 +
+                  'rpx', -->
+
           <!-- :style="{
             width:
               shopTypeList.length <= 5
@@ -96,6 +109,7 @@
                 index < Math.ceil(shopTypeList.length / 4 - 1) * 4
                   ? '44rpx'
                   : '',
+              marginTop: pageType !== 'UnionMall' && index >= 4 ? '44rpx' : '',
             }"
           >
             <div class="imgBox">
@@ -145,7 +159,7 @@
 
     <div class="pageContent">
       <!-- 公告 -->
-      <div class="noticeBox" @click="handleGoNotice">
+      <div class="noticeBox" @click="handleGoNotice" v-if="false">
         <div class="noticeLeft">
           <image class="noticeIcon" src="/static/images/home/noticeIcon.png" />
           <text class="noticeTitle">公告</text>
@@ -616,7 +630,7 @@
     </uni-popup>
 
     <uni-popup ref="noticeRef">
-      <view class="noticePopup" @click="handleHidePopup">
+      <view class="noticePopup" @click="handleHidePopup" v-if="false">
         <view class="popupContent">
           <view class="title">尊敬的会员：</view>
           <view class="contentText"
@@ -1100,7 +1114,7 @@ export default {
       console.log("handleGetShopBigType", data);
       let typeList = data.Data.List;
       let resList = [];
-      let indexOfList = [1248, 1247, 1257, 1245, 1246];
+      let indexOfList = [1248, 1247, 1257, 1245, 1246, 1355];
       if (typeList && typeList.length > 0) {
         typeList.forEach((item) => {
           if (indexOfList.indexOf(item.UserdefinedType_Id) !== -1) {
@@ -2793,45 +2807,49 @@ export default {
   }
 
   .noticePopup {
-    width: 90vw;
+    // width: 90vw;
-    height: 75vh;
+    // height: 75vh;
+
+    width: 70vw;
+    height: calc(2688 * 70vw / 1242);
+
     background: #fff;
     border-radius: 32rpx;
-    background-image: url(https://eshangtech.com/minTestImg/noticeBg.png);
+    background-image: url(https://eshangtech.com/minTestImg/preSalePoster.jpg);
     background-repeat: no-repeat;
     background-size: 100% 100%;
     box-sizing: border-box;
     padding: 300rpx 120rpx 160rpx;
-    .popupContent {
+    // .popupContent {
-      width: 100%;
+    //   width: 100%;
-      height: 100%;
+    //   height: 100%;
-      overflow-y: auto;
+    //   overflow-y: auto;
-      .title {
+    //   .title {
-        font-family: PingFangSC, PingFang SC;
+    //     font-family: PingFangSC, PingFang SC;
-        font-weight: 600;
+    //     font-weight: 600;
-        font-size: 24rpx;
+    //     font-size: 24rpx;
-        color: #da291a;
+    //     color: #da291a;
-        line-height: 40rpx;
+    //     line-height: 40rpx;
-        text-align: left;
+    //     text-align: left;
-        font-style: normal;
+    //     font-style: normal;
-      }
+    //   }
-      .contentText {
+    //   .contentText {
-        font-family: PingFangSC, PingFang SC;
+    //     font-family: PingFangSC, PingFang SC;
-        font-weight: 400;
+    //     font-weight: 400;
-        font-size: 24rpx;
+    //     font-size: 24rpx;
-        color: #262626;
+    //     color: #262626;
-        line-height: 40rpx;
+    //     line-height: 40rpx;
-        text-align: left;
+    //     text-align: left;
-        font-style: normal;
+    //     font-style: normal;
-        text-indent: 48rpx;
+    //     text-indent: 48rpx;
-      }
+    //   }
-      .textIndent {
+    //   .textIndent {
-        text-indent: 48rpx;
+    //     text-indent: 48rpx;
-      }
+    //   }
-    }
+    // }
-    .popupContent::-webkit-scrollbar {
+    // .popupContent::-webkit-scrollbar {
-      display: none;
+    //   display: none;
-    }
+    // }
   }
 
   .backTopBox {

pages/shopMallPage/shopCar/index.vue

@@ -748,6 +748,33 @@ export default {
     },
     // 立即下单
     goPayFn() {
+      // 先检查选中的商品列表里面有没有预售商品
+      let isPresale = false;
+      if (this.shopList && this.shopList.length > 0) {
+        this.shopList.forEach((item) => {
+          if (item.USERDEFINEDTYPE_PID === 1355 && item.select) {
+            if (
+              new Date().getTime() < new Date(item.UPPER_DATE).getTime() ||
+              new Date().getTime() > new Date(item.OFF_DATE).getTime()
+            ) {
+              isPresale = true;
+              //             UPPER_DATE
+              // OFF_DATE
+            }
+          }
+        });
+      }
+
+      console.log("this.shopList", this.shopList);
+
+      if (isPresale) {
+        uni.showToast({
+          title: "选中的商品中有未售商品，无法下单！",
+          icon: "none",
+        });
+        return;
+      }
+
       // 判断是不是在工会商城下单 下单的话 就要查询用户余额  余额有的  才能下单
       if (this.bigPageType === "UnionMall") {
         if (!(this.userInfo.ACCOUNT_BALANCE > 0)) {

pages/shopMallPage/shopType/index.vue

@@ -740,7 +740,7 @@ export default {
       const data = await this.$api.getCoop(req);
       let typeList = data.Data.List;
       let resList = [];
-      let indexOfList = [1248, 1247, 1257, 1245, 1246];
+      let indexOfList = [1248, 1247, 1257, 1245, 1246, 1355];
       if (typeList && typeList.length > 0) {
         typeList.forEach((item) => {
           if (indexOfList.indexOf(item.UserdefinedType_Id) !== -1) {

pages/shopPages/settlement/index.vue

@@ -586,16 +586,8 @@ export default {
           "\n" +
           JSON.stringify(req) +
           "\n",
+        provinceCode: _this.provinceCode || "530000",
       };
-      console.log(
-        "POST\n/v3/pay/transactions/jsapi\n" +
-          timeStamp +
-          "\n" +
-          nonceStr +
-          "\n" +
-          JSON.stringify(req) +
-          "\n"
-      );
 
       const data = await this.$api.$get("/WeChat/GenerateSign", reqSign);
       console.log("data3213123", data.Result_Data);

pages/shopPages/settlementFood/index.vue

@@ -686,16 +686,8 @@ export default {
           "\n" +
           JSON.stringify(req) +
           "\n",
+        provinceCode: _this.provinceCode || "530000",
       };
-      console.log(
-        "POST\n/v3/pay/transactions/jsapi\n" +
-          timeStamp +
-          "\n" +
-          nonceStr +
-          "\n" +
-          JSON.stringify(req) +
-          "\n"
-      );
 
       const data = await this.$api.$get("/WeChat/GenerateSign", reqSign);
       console.log("data3213123", data.Result_Data);
@@ -704,7 +696,7 @@ export default {
       console.log("AuthorizationStr", AuthorizationStr);
 
       uni.request({
-        url: "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi", //仅为示例，并非真实接口地址。
+        url: "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi",
         method: "POST",
         data: req,
         header: {

pages/shopPages/shopDetail/index.vue

@@ -143,6 +143,13 @@
               <!-- {{ good.COMMODITY_MEMBERPRICE || "-" }} -->
             </span>
           </div>
+
+          <div class="originalPrice" v-if="pageType === 'UnionMall'">
+            <span class="unit">¥</span>
+            <span class="oldPrice">
+              {{ good.RETbigNumber || "" }}.{{ good.RETsmallNumber || "00" }}
+            </span>
+          </div>
         </div>
         <div>
           <!-- <span class="sale-count">
@@ -176,6 +183,10 @@
           <div>分享</div>
         </button>
       </div>
+
+      <div class="product-brand" v-if="good.REMINDER_DAY">
+        <view class="inventory">{{ `平均${good.REMINDER_DAY}天内发货` }}</view>
+      </div>
     </div>
 
     <div
@@ -194,10 +205,17 @@
         style="width: 100%; box-sizing: border-box; padding: 0 32rpx"
       >
         <view v-if="new Date(good.UPPER_DATE).getTime() > new Date().getTime()"
-          >预售时间：{{ good.UPPER_DATE || "-" }}-{{
+          >预售时间：{{
-            good.OFF_DATE || "-"
+            good.UPPER_DATE && good.OFF_DATE
+              ? `${good.UPPER_DATE || "-"}-${good.OFF_DATE || "-"}`
+              : good.UPPER_DATE && !good.OFF_DATE
+              ? `${good.UPPER_DATE || "-"}起`
+              : ""
           }}</view
         >
+        <!-- 预售时间：{{ good.UPPER_DATE || "-" }}-{{
+            good.OFF_DATE || "-"
+          }} -->
         <view>{{
           good.SEND_MODE === 1000
             ? "发货模式：自提"
@@ -334,17 +352,24 @@
       > -->
       <view class="rightBtn">
         <div class="addCarBtn" @click="handleShowShopPopup(1)">加入购物车</div>
+        <div
+          class="sellOut presale"
+          @click="handleShowShopPopup(4)"
+          v-if="isCountdown"
+        >
+          预售中
+        </div>
         <div
           class="addOrder"
           @click="handleShowShopPopup(2)"
-          v-if="good.COMMODITY_STOCK > 0"
+          v-if="good.COMMODITY_STOCK > 0 && !isCountdown"
         >
           立即购买
         </div>
         <div
           class="sellOut"
           @click="handleShowShopPopup(3)"
-          v-if="good.COMMODITY_STOCK === 0"
+          v-if="good.COMMODITY_STOCK === 0 && !isCountdown"
         >
           已售罄
         </div>
@@ -372,6 +397,11 @@
       </div> -->
     </div>
 
+    <!-- 预售倒计时 -->
+    <div class="countdown" v-if="isCountdown">
+      此商品为预售商品，起售倒计时 {{ countdown || "" }}
+    </div>
+
     <uni-popup
       :show="showShareBox"
       position="bottom"
@@ -518,7 +548,6 @@ import { mapGetters, mapActions, mapMutations } from "vuex";
 export default {
   data() {
     const windows = uni.getSystemInfoSync();
-
     return {
       pageMsg: {
         current: 0,
@@ -563,6 +592,9 @@ export default {
       pageTab: 1, // 锚点tab的选中
       scrollView: "", // 滚动的锚点
       pageType: "", // 页面类型 UnionMall 为工会商城
+      countdown: "", // 存储倒计时的显示内容
+      isCountdown: false, // 判断是否进入到倒计时
+      timer: null, // 定时器
     };
   },
   components: {
@@ -584,6 +616,32 @@ export default {
       setOrder: "ORDERGOOD",
     }),
     ...mapMutations(["setInvitedCode"]),
+    // 倒计时方法
+    startCountdown(targetTime) {
+      console.log("targetTime", targetTime);
+
+      let target = new Date(targetTime); // 目标时间
+      let _this = this;
+
+      this.timer = setInterval(() => {
+        let now = new Date(); // 当前时间
+        let timeDiff = target - now; // 目标时间与当前时间的差值（毫秒）
+
+        if (timeDiff <= 0) {
+          clearInterval(this.timer); // 倒计时结束，停止定时器
+          _this.isCountdown = false;
+          _this.countdown = "";
+        } else {
+          // 计算剩余时间的小时、分钟和秒数
+          let hours = Math.floor(timeDiff / (1000 * 60 * 60)); // 小时
+          let minutes = Math.floor((timeDiff % (1000 * 60 * 60)) / (1000 * 60)); // 分钟
+          let seconds = Math.floor((timeDiff % (1000 * 60)) / 1000); // 秒
+
+          // 格式化为“时:分:秒”
+          _this.countdown = ` ${hours}时${minutes}分${seconds}秒`;
+        }
+      }, 1000); // 每秒更新一次
+    },
     // 输入框里面的数量
     haveFocus(e, item) {
       console.log("e", e);
@@ -890,9 +948,14 @@ export default {
       this.good = obj;
       this.$forceUpdate();
     },
-    // 打开购物车 或 立即购买的悬浮框  1 打开购物车  2 立即购买  3售罄
+    // 打开购物车 或 立即购买的悬浮框  1 打开购物车  2 立即购买  3售罄  4预售
     handleShowShopPopup(type) {
-      if (type === 3) {
+      if (type === 4) {
+        uni.showToast({
+          title: "商品预售中",
+          icon: "none",
+        });
+      } else if (type === 3) {
         uni.showToast({
           title: "商品已售罄",
           icon: "none",
@@ -994,6 +1057,15 @@ export default {
           _this.good.ContentImgList.map((n) => {
             _this.detailImgList.push({ width: 750, height: 400 });
           });
+
+          if (
+            new Date(_this.good.UPPER_DATE).getTime() > new Date().getTime()
+          ) {
+            _this.isCountdown = true;
+            _this.startCountdown(_this.good.UPPER_DATE);
+          } else {
+            _this.isCountdown = false;
+          }
         });
     },
     getRate() {
@@ -1403,6 +1475,7 @@ export default {
     this.isShowCount = false;
     this.showSharePro = false;
     this.good = {};
+    clearInterval(this.timer);
   },
   onLoad(option) {
     this.menu = uni.getMenuButtonBoundingClientRect();
@@ -1666,6 +1739,20 @@ hr {
   }
 }
 
+.originalPrice {
+  display: inline-block;
+  margin-left: 16rpx;
+  .unit {
+    font-size: 24rpx;
+    color: #999999;
+  }
+  .oldPrice {
+    font-size: 28rpx;
+    color: #999999;
+    text-decoration: line-through;
+  }
+}
+
 // .share-btn:before
 // content ''
 // height 31rpx
@@ -1948,6 +2035,9 @@ button:after {
       background: #bbbbbb;
       border-radius: 0 16rpx 16rpx 0;
     }
+    .presale {
+      background: #ffae00;
+    }
   }
 
   .shopcart-btn:before {
@@ -2006,6 +2096,25 @@ button:after {
   }
 }
 
+.countdown {
+  width: 100%;
+  height: 64rpx;
+  background: #fff2e7;
+  position: fixed;
+  left: 0;
+  bottom: 124rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #ff8417;
+  line-height: 32rpx;
+  text-align: justify;
+  font-style: normal;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .popup-box {
   padding: 50rpx 40rpx 32rpx;
   font-size: 28rpx;

unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/tabbar":1,"uni_modules/l-dragSort/components/l-dragSort/l-dragSort":1,"components/shopTabbar":1,"uni_modules/uni-popup/components/uni-popup/uni-popup":1,"components/noData":1,"pages/order/buyOrder/components/orderItem":1,"pages/order/foodOrder/components/orderItem":1,"pages/shopPages/settlement/components/commodityItem":1,"pages/shopPages/settlement/components/loading/index":1,"pages/shopPages/settlement/components/orderInfo":1,"pages/shopPages/settlement/components/orderStatus":1,"pages/shopPages/settlement/components/receiveGoods":1,"components/card":1,"pages/shopPages/shop/components/merchantEvaluation":1,"pages/storeDetail/components/merchantEvaluation":1,"pages/evaluateList/components/orderItem":1,"uni_modules/uni-rate/components/uni-rate/uni-rate":1,"components/keyboard":1,"components/currentService":1,"uni_modules/uni-icons/components/uni-icons/uni-icons":1};
+/******/ 		var cssChunks = {"components/tabbar":1,"uni_modules/uni-popup/components/uni-popup/uni-popup":1,"uni_modules/l-dragSort/components/l-dragSort/l-dragSort":1,"components/shopTabbar":1,"components/noData":1,"pages/order/buyOrder/components/orderItem":1,"pages/order/foodOrder/components/orderItem":1,"pages/shopPages/settlement/components/commodityItem":1,"pages/shopPages/settlement/components/loading/index":1,"pages/shopPages/settlement/components/orderInfo":1,"pages/shopPages/settlement/components/orderStatus":1,"pages/shopPages/settlement/components/receiveGoods":1,"components/card":1,"pages/shopPages/shop/components/merchantEvaluation":1,"pages/storeDetail/components/merchantEvaluation":1,"pages/evaluateList/components/orderItem":1,"uni_modules/uni-rate/components/uni-rate/uni-rate":1,"components/keyboard":1,"components/currentService":1,"uni_modules/uni-icons/components/uni-icons/uni-icons":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"components/tabbar":"components/tabbar","uni_modules/l-dragSort/components/l-dragSort/l-dragSort":"uni_modules/l-dragSort/components/l-dragSort/l-dragSort","components/shopTabbar":"components/shopTabbar","uni_modules/uni-popup/components/uni-popup/uni-popup":"uni_modules/uni-popup/components/uni-popup/uni-popup","components/noData":"components/noData","pages/order/buyOrder/components/orderItem":"pages/order/buyOrder/components/orderItem","pages/order/foodOrder/components/orderItem":"pages/order/foodOrder/components/orderItem","pages/shopPages/settlement/components/commodityItem":"pages/shopPages/settlement/components/commodityItem","pages/shopPages/settlement/components/loading/index":"pages/shopPages/settlement/components/loading/index","pages/shopPages/settlement/components/orderInfo":"pages/shopPages/settlement/components/orderInfo","pages/shopPages/settlement/components/orderStatus":"pages/shopPages/settlement/components/orderStatus","pages/shopPages/settlement/components/receiveGoods":"pages/shopPages/settlement/components/receiveGoods","components/card":"components/card","pages/shopPages/shop/components/merchantEvaluation":"pages/shopPages/shop/components/merchantEvaluation","pages/storeDetail/components/merchantEvaluation":"pages/storeDetail/components/merchantEvaluation","pages/evaluateList/components/orderItem":"pages/evaluateList/components/orderItem","uni_modules/uni-rate/components/uni-rate/uni-rate":"uni_modules/uni-rate/components/uni-rate/uni-rate","components/keyboard":"components/keyboard","components/currentService":"components/currentService","uni_modules/uni-transition/components/uni-transition/uni-transition":"uni_modules/uni-transition/components/uni-transition/uni-transition","uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/tabbar":"components/tabbar","uni_modules/uni-popup/components/uni-popup/uni-popup":"uni_modules/uni-popup/components/uni-popup/uni-popup","uni_modules/l-dragSort/components/l-dragSort/l-dragSort":"uni_modules/l-dragSort/components/l-dragSort/l-dragSort","components/shopTabbar":"components/shopTabbar","components/noData":"components/noData","pages/order/buyOrder/components/orderItem":"pages/order/buyOrder/components/orderItem","pages/order/foodOrder/components/orderItem":"pages/order/foodOrder/components/orderItem","pages/shopPages/settlement/components/commodityItem":"pages/shopPages/settlement/components/commodityItem","pages/shopPages/settlement/components/loading/index":"pages/shopPages/settlement/components/loading/index","pages/shopPages/settlement/components/orderInfo":"pages/shopPages/settlement/components/orderInfo","pages/shopPages/settlement/components/orderStatus":"pages/shopPages/settlement/components/orderStatus","pages/shopPages/settlement/components/receiveGoods":"pages/shopPages/settlement/components/receiveGoods","components/card":"components/card","pages/shopPages/shop/components/merchantEvaluation":"pages/shopPages/shop/components/merchantEvaluation","pages/storeDetail/components/merchantEvaluation":"pages/storeDetail/components/merchantEvaluation","pages/evaluateList/components/orderItem":"pages/evaluateList/components/orderItem","uni_modules/uni-rate/components/uni-rate/uni-rate":"uni_modules/uni-rate/components/uni-rate/uni-rate","components/keyboard":"components/keyboard","components/currentService":"components/currentService","uni_modules/uni-transition/components/uni-transition/uni-transition":"uni_modules/uni-transition/components/uni-transition/uni-transition","uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1757,7 +1757,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -20271,7 +20271,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -20292,14 +20292,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -20395,7 +20395,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

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/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/index/index.js

@@ -98,6 +98,29 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
 var components
+try {
+  components = {
+    uniPopup: function () {
+      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 363))
+    },
+  }
+} catch (e) {
+  if (
+    e.message.indexOf("Cannot find module") !== -1 &&
+    e.message.indexOf(".vue") !== -1
+  ) {
+    console.error(e.message)
+    console.error("1. 排查组件名称拼写是否正确")
+    console.error(
+      "2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
+    )
+    console.error(
+      "3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
+    )
+  } else {
+    throw e
+  }
+}
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -312,17 +335,25 @@ var _default = {
       // ios的安全距离
       showBackTop: false,
       // 页面滚动距离
-      scrollView: ""
+      scrollView: "",
+      showPoster: true // 判断是否显示海报
     };
   },
   onLoad: function onLoad() {
     var _this2 = this;
     return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var systemInfo, height, currentService, seatInfo, funList, newFunList;
+      var stronge, systemInfo, height, currentService, seatInfo, funList, newFunList;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              stronge = uni.getStorageSync("showIndexPoster");
+              console.log("stronge", stronge);
+              if (stronge === 1 || stronge === "1") {
+                _this2.showPoster = false;
+              } else {
+                _this2.$refs.noticeRef.open("center");
+              }
               _this2.menu = uni.getMenuButtonBoundingClientRect();
               systemInfo = uni.getSystemInfoSync();
               console.log("systemInfo", systemInfo);
@@ -368,7 +399,7 @@ var _default = {
               _this2.handleGetProductsList();
               // 商城的内容
               _this2.handleGetShoppingMall();
-            case 15:
+            case 18:
             case "end":
               return _context.stop();
           }
@@ -443,6 +474,13 @@ var _default = {
   },
 
   methods: {
+    handleHidePopup: function handleHidePopup() {
+      uni.setStorageSync("showIndexPoster", 1);
+      this.$refs.noticeRef.close();
+      uni.navigateTo({
+        url: "/pages/shopMallPage/shopType/index"
+      });
+    },
     // 回到顶部
     handleGoBack: function handleGoBack() {
       this.scrollView = "navItem";

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

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "",
   "navigationStyle": "custom",
   "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
     "tabbar": "/components/tabbar"
   }
 }

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

@@ -613,6 +613,17 @@
   height: 0;
   color: transparent;
 }
+.main .noticePopup.data-v-57280228 {
+  width: 70vw;
+  height: calc(2688 * 70vw / 1242);
+  background: #fff;
+  border-radius: 32rpx;
+  background-image: url(https://eshangtech.com/minTestImg/preSalePoster.jpg);
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  box-sizing: border-box;
+  padding: 300rpx 120rpx 160rpx;
+}
 .main .backTopBox.data-v-57280228 {
   width: 40px;
   height: 40px;

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

@@ -126,21 +126,26 @@ var render = function () {
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var g0 = _vm.shopTypeList.length
-  var g1 = !(g0 < 5) ? Math.ceil(_vm.shopTypeList.length / 5) : null
+  var g1 = !(g0 < 5) ? _vm.shopTypeList.length : null
-  var g2 = !(g0 < 5) ? Math.ceil(_vm.shopTypeList.length / 5) : null
+  var g2 = !(g0 < 5) && g1 === 5 ? Math.ceil(6 / 5) : null
+  var g3 = !(g0 < 5) && g1 === 5 ? Math.ceil(6 / 5) : null
+  var g4 =
+    !(g0 < 5) && !(g1 === 5) ? Math.ceil(_vm.shopTypeList.length / 5) : null
+  var g5 =
+    !(g0 < 5) && !(g1 === 5) ? Math.ceil(_vm.shopTypeList.length / 5) : null
   var l0 = _vm.__map(_vm.shopTypeList, function (item, index) {
     var $orig = _vm.__get_orig(item)
-    var g3 =
+    var g6 =
       _vm.pageType === "UnionMall" &&
       index < Math.ceil(_vm.shopTypeList.length / 4 - 1) * 4
     return {
       $orig: $orig,
-      g3: g3,
+      g6: g6,
     }
   })
-  var g4 = _vm.pageType !== "UnionMall" ? _vm.specialOffersList.length : null
+  var g7 = _vm.pageType !== "UnionMall" ? _vm.specialOffersList.length : null
-  var g5 = _vm.pageType !== "UnionMall" ? _vm.todayOffersList.length : null
+  var g8 = _vm.pageType !== "UnionMall" ? _vm.todayOffersList.length : null
-  var g6 =
+  var g9 =
     _vm.pageType === "UnionMall"
       ? _vm.showShopList && _vm.showShopList.length > 0
       : null
@@ -151,10 +156,13 @@ var render = function () {
         g0: g0,
         g1: g1,
         g2: g2,
-        l0: l0,
+        g3: g3,
         g4: g4,
         g5: g5,
-        g6: g6,
+        l0: l0,
+        g7: g7,
+        g8: g8,
+        g9: g9,
       },
     }
   )
@@ -759,7 +767,7 @@ var _default = {
                 console.log("handleGetShopBigType", data);
                 typeList = data.Data.List;
                 resList = [];
-                indexOfList = [1248, 1247, 1257, 1245, 1246];
+                indexOfList = [1248, 1247, 1257, 1245, 1246, 1355];
                 if (typeList && typeList.length > 0) {
                   typeList.forEach(function (item) {
                     if (indexOfList.indexOf(item.UserdefinedType_Id) !== -1) {

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

@@ -1206,46 +1206,16 @@
   margin-top: 40rpx;
 }
 .main .noticePopup.data-v-79c11018 {
-  width: 90vw;
+  width: 70vw;
-  height: 75vh;
+  height: calc(2688 * 70vw / 1242);
   background: #fff;
   border-radius: 32rpx;
-  background-image: url(https://eshangtech.com/minTestImg/noticeBg.png);
+  background-image: url(https://eshangtech.com/minTestImg/preSalePoster.jpg);
   background-repeat: no-repeat;
   background-size: 100% 100%;
   box-sizing: border-box;
   padding: 300rpx 120rpx 160rpx;
 }
-.main .noticePopup .popupContent.data-v-79c11018 {
-  width: 100%;
-  height: 100%;
-  overflow-y: auto;
-}
-.main .noticePopup .popupContent .title.data-v-79c11018 {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 600;
-  font-size: 24rpx;
-  color: #da291a;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-}
-.main .noticePopup .popupContent .contentText.data-v-79c11018 {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #262626;
-  line-height: 40rpx;
-  text-align: left;
-  font-style: normal;
-  text-indent: 48rpx;
-}
-.main .noticePopup .popupContent .textIndent.data-v-79c11018 {
-  text-indent: 48rpx;
-}
-.main .noticePopup .popupContent.data-v-79c11018::-webkit-scrollbar {
-  display: none;
-}
 .main .backTopBox.data-v-79c11018 {
   width: 40px;
   height: 40px;

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

@@ -722,6 +722,29 @@ var _default = {
     },
     // 立即下单
     goPayFn: function goPayFn() {
+      // 先检查选中的商品列表里面有没有预售商品
+      var isPresale = false;
+      if (this.shopList && this.shopList.length > 0) {
+        this.shopList.forEach(function (item) {
+          if (item.USERDEFINEDTYPE_PID === 1355 && item.select) {
+            if (new Date().getTime() < new Date(item.UPPER_DATE).getTime() || new Date().getTime() > new Date(item.OFF_DATE).getTime()) {
+              isPresale = true;
+              //             UPPER_DATE
+              // OFF_DATE
+            }
+          }
+        });
+      }
+
+      console.log("this.shopList", this.shopList);
+      if (isPresale) {
+        uni.showToast({
+          title: "选中的商品中有未售商品，无法下单！",
+          icon: "none"
+        });
+        return;
+      }
+
       // 判断是不是在工会商城下单 下单的话 就要查询用户余额  余额有的  才能下单
       if (this.bigPageType === "UnionMall") {
         if (!(this.userInfo.ACCOUNT_BALANCE > 0)) {

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

@@ -606,7 +606,7 @@ var _default = {
                 data = _context3.sent;
                 typeList = data.Data.List;
                 resList = [];
-                indexOfList = [1248, 1247, 1257, 1245, 1246];
+                indexOfList = [1248, 1247, 1257, 1245, 1246, 1355];
                 if (typeList && typeList.length > 0) {
                   typeList.forEach(function (item) {
                     if (indexOfList.indexOf(item.UserdefinedType_Id) !== -1) {

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

@@ -716,12 +716,12 @@ var _default = {
 
                 console.log("req", req);
                 reqSign = {
-                  parameters: "POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n"
+                  parameters: "POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n",
+                  provinceCode: _this.provinceCode || "530000"
                 };
-                console.log("POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n");
+                _context6.next = 12;
-                _context6.next = 13;
                 return _this7.$api.$get("/WeChat/GenerateSign", reqSign);
-              case 13:
+              case 12:
                 data = _context6.sent;
                 console.log("data3213123", data.Result_Data);
                 Authorization = "mchid=\"".concat(mchid, "\",nonce_str=\"").concat(nonceStr, "\",signature=\"").concat(data.Result_Data, "\",timestamp=\"").concat(timeStamp, "\",serial_no=\"").concat(serial_no, "\"");
@@ -790,7 +790,7 @@ var _default = {
                   }()
                 });
                 return _context6.abrupt("return");
-              case 22:
+              case 21:
               case "end":
                 return _context6.stop();
             }

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

@@ -526,12 +526,12 @@ var _default = {
 
                 console.log("req", req);
                 reqSign = {
-                  parameters: "POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n"
+                  parameters: "POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n",
+                  provinceCode: _this.provinceCode || "530000"
                 };
-                console.log("POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n");
+                _context2.next = 11;
-                _context2.next = 12;
                 return _this2.$api.$get("/WeChat/GenerateSign", reqSign);
-              case 12:
+              case 11:
                 data = _context2.sent;
                 console.log("data3213123", data.Result_Data);
                 Authorization = "mchid=\"".concat(mchid, "\",nonce_str=\"").concat(nonceStr, "\",signature=\"").concat(data.Result_Data, "\",timestamp=\"").concat(timeStamp, "\",serial_no=\"").concat(serial_no, "\"");
@@ -539,7 +539,6 @@ var _default = {
                 console.log("AuthorizationStr", AuthorizationStr);
                 uni.request({
                   url: "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi",
-                  //仅为示例，并非真实接口地址。
                   method: "POST",
                   data: req,
                   header: {
@@ -599,7 +598,7 @@ var _default = {
                     return success;
                   }()
                 });
-              case 18:
+              case 17:
               case "end":
                 return _context2.stop();
             }

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

@@ -260,7 +260,13 @@ var _default = {
       // 锚点tab的选中
       scrollView: "",
       // 滚动的锚点
-      pageType: "" // 页面类型 UnionMall 为工会商城
+      pageType: "",
+      // 页面类型 UnionMall 为工会商城
+      countdown: "",
+      // 存储倒计时的显示内容
+      isCountdown: false,
+      // 判断是否进入到倒计时
+      timer: null // 定时器
     };
   },
 
@@ -277,6 +283,31 @@ var _default = {
   })), (0, _vuex.mapMutations)("shoppingCart", {
     setOrder: "ORDERGOOD"
   })), (0, _vuex.mapMutations)(["setInvitedCode"])), {}, {
+    // 倒计时方法
+    startCountdown: function startCountdown(targetTime) {
+      var _this2 = this;
+      console.log("targetTime", targetTime);
+      var target = new Date(targetTime); // 目标时间
+      var _this = this;
+      this.timer = setInterval(function () {
+        var now = new Date(); // 当前时间
+        var timeDiff = target - now; // 目标时间与当前时间的差值（毫秒）
+
+        if (timeDiff <= 0) {
+          clearInterval(_this2.timer); // 倒计时结束，停止定时器
+          _this.isCountdown = false;
+          _this.countdown = "";
+        } else {
+          // 计算剩余时间的小时、分钟和秒数
+          var hours = Math.floor(timeDiff / (1000 * 60 * 60)); // 小时
+          var minutes = Math.floor(timeDiff % (1000 * 60 * 60) / (1000 * 60)); // 分钟
+          var seconds = Math.floor(timeDiff % (1000 * 60) / 1000); // 秒
+
+          // 格式化为“时:分:秒”
+          _this.countdown = " ".concat(hours, "\u65F6").concat(minutes, "\u5206").concat(seconds, "\u79D2");
+        }
+      }, 1000); // 每秒更新一次
+    },
     // 输入框里面的数量
     haveFocus: function haveFocus(e, item) {
       console.log("e", e);
@@ -419,7 +450,7 @@ var _default = {
     },
     // 加入购物车方法
     handleAddShopCar: function handleAddShopCar() {
-      var _this2 = this;
+      var _this3 = this;
       if (this.good.SKULIST && this.good.SKULIST.length > 0 && (this.good.COMMODITY_RULE === "默认" || !this.good.COMMODITY_RULE)) {
         uni.showToast({
           title: "请先选择规格！",
@@ -449,9 +480,9 @@ var _default = {
         // 判断有没有一样的
         var isSame = false;
         this.shopCarList.forEach(function (item) {
-          if (item.COMMODITY_BARCODE === _this2.good.COMMODITY_BARCODE) {
+          if (item.COMMODITY_BARCODE === _this3.good.COMMODITY_BARCODE) {
-            item.count += _this2.good.count;
+            item.count += _this3.good.count;
-            item.COMMODITY_RULE = _this2.good.COMMODITY_RULE;
+            item.COMMODITY_RULE = _this3.good.COMMODITY_RULE;
             isSame = true;
           }
         });
@@ -480,7 +511,7 @@ var _default = {
         duration: 2000
       });
       setTimeout(function () {
-        _this2.$refs.shopPopup.close();
+        _this3.$refs.shopPopup.close();
       }, 2000);
     },
     // 立即购买方法
@@ -568,9 +599,14 @@ var _default = {
       this.good = obj;
       this.$forceUpdate();
     },
-    // 打开购物车 或 立即购买的悬浮框  1 打开购物车  2 立即购买  3售罄
+    // 打开购物车 或 立即购买的悬浮框  1 打开购物车  2 立即购买  3售罄  4预售
     handleShowShopPopup: function handleShowShopPopup(type) {
-      if (type === 3) {
+      if (type === 4) {
+        uni.showToast({
+          title: "商品预售中",
+          icon: "none"
+        });
+      } else if (type === 3) {
         uni.showToast({
           title: "商品已售罄",
           icon: "none"
@@ -660,6 +696,12 @@ var _default = {
             height: 400
           });
         });
+        if (new Date(_this.good.UPPER_DATE).getTime() > new Date().getTime()) {
+          _this.isCountdown = true;
+          _this.startCountdown(_this.good.UPPER_DATE);
+        } else {
+          _this.isCountdown = false;
+        }
       });
     },
     getRate: function getRate() {
@@ -1023,6 +1065,7 @@ var _default = {
     this.isShowCount = false;
     this.showSharePro = false;
     this.good = {};
+    clearInterval(this.timer);
   },
   onLoad: function onLoad(option) {
     this.menu = uni.getMenuButtonBoundingClientRect();

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

@@ -186,6 +186,19 @@
   margin-bottom: 2rpx;
   display: inline-block;
 }
+.originalPrice.data-v-0dc4ca38 {
+  display: inline-block;
+  margin-left: 16rpx;
+}
+.originalPrice .unit.data-v-0dc4ca38 {
+  font-size: 24rpx;
+  color: #999999;
+}
+.originalPrice .oldPrice.data-v-0dc4ca38 {
+  font-size: 28rpx;
+  color: #999999;
+  text-decoration: line-through;
+}
 .share-btn.data-v-0dc4ca38 {
   position: relative;
   background: #fff;
@@ -415,6 +428,9 @@ button.data-v-0dc4ca38:after {
   background: #bbbbbb;
   border-radius: 0 16rpx 16rpx 0;
 }
+.product-btn-box .rightBtn .presale.data-v-0dc4ca38 {
+  background: #ffae00;
+}
 .product-btn-box .shopcart-btn.data-v-0dc4ca38:before {
   content: "";
   height: 45rpx;
@@ -463,6 +479,24 @@ button.data-v-0dc4ca38:after {
   color: #fff;
   background: linear-gradient(to right, #c5a671, #dcc194);
 }
+.countdown.data-v-0dc4ca38 {
+  width: 100%;
+  height: 64rpx;
+  background: #fff2e7;
+  position: fixed;
+  left: 0;
+  bottom: 124rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #ff8417;
+  line-height: 32rpx;
+  text-align: justify;
+  font-style: normal;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 .popup-box.data-v-0dc4ca38 {
   padding: 50rpx 40rpx 32rpx;
   font-size: 28rpx;

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

@@ -7,6 +7,20 @@
     "condition": {
         "miniprogram": {
             "list": [
+                {
+                    "name": "pages/shopPages/shopDetail/index",
+                    "pathName": "pages/shopPages/shopDetail/index",
+                    "query": "id=30280&pageType=UnionMall",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "pages/shopPages/shopDetail/index",
+                    "pathName": "pages/shopPages/shopDetail/index",
+                    "query": "id=30656&pageType=",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "pages/shopPages/shopDetail/index",
                     "pathName": "pages/shopPages/shopDetail/index",