update

pages/index/index.vue

@@ -578,15 +578,16 @@ export default {
     let stronge = uni.getStorageSync("showIndexPoster");
     console.log("stronge", stronge);
 
-    if (
+    this.$refs.noticeRef.open("center");
-      stronge === 1 ||
+    // if (
-      stronge === "1" ||
+    //   stronge === 1 ||
-      new Date("2025-03-02 8:00:00").getTime() < new Date().getTime()
+    //   stronge === "1" ||
-    ) {
+    //   new Date("2025-03-02 8:00:00").getTime() < new Date().getTime()
-      this.showPoster = false;
+    // ) {
-    } else {
+    //   this.showPoster = false;
-      this.$refs.noticeRef.open("center");
+    // } else {
-    }
+    //   this.$refs.noticeRef.open("center");
+    // }
 
     this.menu = uni.getMenuButtonBoundingClientRect();
     let systemInfo = uni.getSystemInfoSync();

pages/order/buyOrder/index.vue

@@ -235,7 +235,9 @@ export default {
         action_type: "GetMallOrderList",
         salebillType:
           this.searchType === "6"
-            ? 3999
+            ? this.pageType === "UnionMall"
+              ? 3001
+              : 3999
             : this.pageType === "UnionMall"
             ? 3001
             : 3000,

pages/order/orderdetail/index.vue

@@ -29,7 +29,10 @@
       <div class="status-btn-box">
         <block v-if="orderInfo.SALEBILL_STATE === 1005">
           <div class="back-btn" @click="orderCancle">取消订单</div>
-          <div class="continu-btn" @click="goPayment(orderInfo)">
+          <div
+            class="continu-btn"
+            @click="goPayment(orderInfo, orderInfo.TOTAL_PAY)"
+          >
             去付款 <span>{{ minutes }}</span>
           </div>
         </block>
@@ -112,7 +115,7 @@
           <span class="order-info-t">下单人员</span
           ><span>{{ orderInfo.ORDER_PERSON }}</span>
         </p>
-        <p class="order-info-type">
+        <p class="order-info-type" v-if="orderInfo.RESERVATION_DATE">
           <span class="order-info-t">预约时间</span
           ><span>{{ orderInfo.RESERVATION_DATE }}</span>
         </p>
@@ -120,6 +123,15 @@
           <span class="order-info-t">预约电话</span
           ><span>{{ orderInfo.ORDER_PERSONTEL }}</span>
         </p>
+        <p class="order-info-type" v-if="orderInfo.BALANCE_PAYMENT">
+          <span class="order-info-t">余额支付</span
+          ><span>￥{{ orderInfo.BALANCE_PAYMENT }}</span>
+        </p>
+
+        <p class="order-info-type" v-if="orderInfo.TOTAL_PAY">
+          <span class="order-info-t">微信支付</span
+          ><span>￥{{ orderInfo.TOTAL_PAY }}</span>
+        </p>
       </block>
     </div>
 
@@ -372,7 +384,7 @@ export default {
         this.getOrderInfo();
       }
     },
-    async goPayment(obj) {
+    async goPayment(obj, payMoney) {
       console.log("tatalMoney", this.tatalMoney);
       // this.$refs.payPopup.open("bottom");
       // 判断用户是否可余额支付
@@ -402,7 +414,9 @@ export default {
         notify_url:
           "https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
         amount: {
-          total: Number(_this.tatalMoney) * 100 || 1,
+          total: payMoney
+            ? payMoney * 100
+            : Number(_this.tatalMoney) * 100 || 1,
           currency: "CNY",
         }, // 订单金额
         payer: {
@@ -469,7 +483,9 @@ export default {
             package: `prepay_id=${res.data.prepay_id}`,
             signType: "RSA",
             paySign: paySign,
-            total_fee: Number(_this.tatalMoney) * 100 || 1,
+            total_fee: payMoney
+              ? payMoney * 100
+              : Number(_this.tatalMoney) * 100 || 1,
             success(res) {
               console.log("res", res);
             },
@@ -601,6 +617,7 @@ export default {
               action_data: _this.orderInfo.SALEBILL_ID,
               saleBillChildId: _this.sellchildid > 0 ? _this.sellchildid : "",
               SALEBILL_STATE: 9999,
+              mixPay: 1,
               // deliverDate: new Date()
             };
             const data = await _this.$api.getCoop(req);

pages/shopMallPage/index/index.vue

@@ -173,6 +173,77 @@
         </div>
       </div>
 
+      <!-- 活动 -->
+      <div
+        class="advertisement"
+        v-if="haveActivity"
+        :style="{
+          background: pageType !== 'UnionMall' ? '#fff' : 'transparent',
+        }"
+      >
+        <div
+          class="advertisementContentBox"
+          v-if="pageType !== 'UnionMall'"
+          @click="handleGoActivityType"
+        >
+          <div class="advertisementTop">
+            <div class="title">
+              {{ activityObj.UserdefinedType_Name || "" }}
+              <!-- <image
+                class="titleImg"
+                src="https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/title1st.png"
+              /> -->
+            </div>
+            <!-- <div class="moreBox">
+              <text class="moreText">低价爆品天天有</text>
+              <image
+                class="rightIcon"
+                src="https://eshangtech.com/ShopICO/ahyd-mall/wechatesAH/rightArrow.png"
+              />
+            </div> -->
+          </div>
+
+          <scroll-view
+            class="shopList"
+            scroll-x
+            v-if="activityShopList && activityShopList.length > 0"
+          >
+            <!--                        @click="handleGoShop(item)"-->
+            <div
+              :style="{
+                width: activityShopList.length * 160 + 'rpx',
+                height: '100%',
+                whiteSpace: 'noWrap',
+              }"
+            >
+              <div
+                class="shopItem"
+                v-for="(item, index) in activityShopList"
+                :key="index"
+                @click.stop="handleGoActivityType"
+              >
+                <div class="shopItemImg">
+                  <div class="imgBox">
+                    <image
+                      class="shopImg"
+                      :src="
+                        item.IMAGE_PATH || '/static/images/home/defultImg.png'
+                      "
+                    />
+                  </div>
+                  <text class="discountedPrice"
+                    >¥{{ item.bigNumber || "" }}.{{
+                      item.smallNumber || "00"
+                    }}</text
+                  >
+                </div>
+                <!--                            <text class="price">¥15.99</text>-->
+              </div>
+            </div>
+          </scroll-view>
+        </div>
+      </div>
+
       <!--  特价优惠  -->
       <div
         class="advertisement"
@@ -629,8 +700,8 @@
       </view>
     </uni-popup>
 
-    <uni-popup ref="noticeRef">
+    <uni-popup ref="noticeRef" v-if="false">
-      <view class="noticePopup" @click="handleHidePopup" v-if="false">
+      <view class="noticePopup" @click="handleHidePopup">
         <view class="popupContent">
           <view class="title">尊敬的会员：</view>
           <view class="contentText"
@@ -726,6 +797,9 @@ export default {
       showBackTop: false, // 页面滚动距离
       scrollView: "",
       safeHeight: 0, // ios的安全距离
+      haveActivity: false, // 是否有活动
+      activityObj: {}, // 活动项的具体内容
+      activityShopList: [], // 活动商品列表
     };
   },
   async onLoad(query) {
@@ -737,7 +811,7 @@ export default {
     if (firstEntry === "2") {
     } else {
       this.isFirst = true;
-      this.$refs.noticeRef.open("center");
+      // this.$refs.noticeRef.open("center");
       uni.setStorageSync("firstEntry", "2");
     }
     let safeHeight = uni.getStorageSync("safeHeight");
@@ -821,6 +895,9 @@ export default {
       this.handleGetTodayOffers();
       // 最下面的甄选商品
       this.handleGetProductsList();
+      if (this.haveActivity) {
+        this.handleGetActivityList();
+      }
     }
   },
   onShow() {
@@ -1114,18 +1191,32 @@ export default {
       console.log("handleGetShopBigType", data);
       let typeList = data.Data.List;
       let resList = [];
-      let indexOfList = [1248, 1247, 1257, 1245, 1246, 1355];
+      // 如果有活动的话就有值
+      let activityObj = {};
+      let indexOfList = [1248, 1247, 1257, 1245, 1246];
+      // , 1355
       if (typeList && typeList.length > 0) {
         typeList.forEach((item) => {
           if (indexOfList.indexOf(item.UserdefinedType_Id) !== -1) {
             resList.push(item);
           }
+
+          if (item.UserdefinedType_Id === 1355) {
+            this.haveActivity = true;
+            activityObj = item;
+          }
         });
       }
 
+      if (this.haveActivity) {
+        // resList.push(activityObj);
+        this.activityObj = activityObj;
+      }
+
       this.shopTypeList = resList;
       this.selectProducts = resList[0].UserdefinedType_Id;
-      console.log("this.selectProducts", this.selectProducts);
+      console.log("this.shopTypeList", this.shopTypeList);
+      console.log("this.activityObj", this.activityObj);
 
       // if (this.shopTypeList && this.shopTypeList.length < 10) {
       //   this.oneRowNumber = this.shopTypeList.length;
@@ -1134,6 +1225,40 @@ export default {
       // }
       // console.log("this.oneRowNumber", this.oneRowNumber);
     },
+    // 拿到活动的商品列表 可能不调用 有判断的
+    async handleGetActivityList() {
+      const data = await this.$api.getCoop({
+        action_type: "WeChat_GetMallGoodsInfo",
+        ownerUnitId: 911,
+        userdefinedtypeId: 1355,
+        excludeNature: 5070,
+        justCommodity: 1,
+      });
+      console.log("handleGetActivityList", data);
+      let list = data.Data.List;
+      let res = [];
+      if (list && list.length > 0) {
+        list.forEach((item) => {
+          if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
+            item.COMMODITYLIST.forEach((subItem) => {
+              if (
+                subItem.COMMODITY_MEMBERPRICE &&
+                subItem.COMMODITY_MEMBERPRICE.toString().indexOf(".") !== -1
+              ) {
+                subItem.bigNumber =
+                  subItem.COMMODITY_MEMBERPRICE.toString().split(".")[0];
+                subItem.smallNumber =
+                  subItem.COMMODITY_MEMBERPRICE.toString().split(".")[1];
+              } else {
+                subItem.bigNumber = subItem.COMMODITY_MEMBERPRICE;
+              }
+              res.push(subItem);
+            });
+          }
+        });
+      }
+      this.activityShopList = res;
+    },
     // 拿到特价优惠的商品列表 nature 5030
     async handleGetSpecialOffers() {
       const data = await this.$api.getCoop({
@@ -1380,6 +1505,14 @@ export default {
         });
       }
     },
+    // 活动直接跳转分类页面 分类页面的互动是第一个 所以 selectIndex 传0就好
+    handleGoActivityType() {
+      uni.redirectTo({
+        url: `/pages/shopMallPage/shopType/index?selectIndex=${0}&pageType=${
+          this.pageType
+        }`,
+      });
+    },
     // 跳转工会商城
     handleGoUnionMall() {
       uni.navigateTo({
@@ -1744,6 +1877,9 @@ export default {
           justify-content: space-between;
 
           .title {
+            font-size: 14px;
+            font-weight: 600;
+            color: #181716;
             .titleImg {
               width: 112rpx;
               height: 36rpx;

pages/shopMallPage/shopCar/index.vue

@@ -784,13 +784,15 @@ export default {
           });
           return;
         } else if (this.totalPay > Number(this.userInfo.ACCOUNT_BALANCE)) {
-          uni.showToast({
+          // uni.showToast({
-            title: "账户余额不足！",
+          //   title: "账户余额不足！",
-            icon: "none",
+          //   icon: "none",
-          });
+          // });
-          return;
+          // return;
         }
       }
+
+
       console.log("this.shopList", this.shopList);
       if (this.shopList.length > 0) {
         this.pageOut = true;

pages/shopPages/settlement/index.vue

@@ -87,6 +87,22 @@
       </div>
     </div>
 
+    <!-- <div class="order_remark margin_auto payBox">
+      <div class="label">支付方式</div>
+      <div class="selectBox">
+        <picker
+          class="pickerBox"
+          @change="handlePayTypeChange"
+          :value="payType"
+          :range="payTypeList"
+          range-key="label"
+        >
+          <view class="picker"> {{ payTypeList[payType].label }} </view>
+        </picker>
+        <img class="rightIcon" src="/static/images/home/rightArrow.png" />
+      </div>
+    </div> -->
+
     <div class="order_remark margin_auto">
       <div class="title">订单备注</div>
       <div class="order_remark_input" v-if="!isSubmit">
@@ -105,7 +121,25 @@
           合计<span class="unit">￥</span
           ><span class="price">{{ couponOrder }}</span>
         </div>
-        <div class="place_order_btn" @click="createOrder">立即下单</div>
+
+        <div
+          v-if="pageType === 'UnionMall' && payType === 1"
+          class="place_order_btn"
+          @click="handleCombinationPayment"
+        >
+          组合支付
+        </div>
+
+        <div
+          v-if="
+            (pageType === 'UnionMall' && payType === 0) ||
+            pageType !== 'UnionMall'
+          "
+          class="place_order_btn"
+          @click="createOrder"
+        >
+          立即下单
+        </div>
       </div>
       <div class="back" v-else @click="handleBackIndex">返回购物车</div>
     </div>
@@ -216,6 +250,11 @@ export default {
       selectTab: 1, // 1 是 配送  2 到店自取
       phoneNumber: "", // 当前用户的默认手机号
       isMakeOrdering: false,
+      payType: 0, // 默认是立即下单
+      payTypeList: [
+        { label: "立即下单", value: 1 },
+        { label: "组合支付", value: 2 },
+      ],
     };
   },
   computed: {
@@ -272,6 +311,13 @@ export default {
     this.isFirst = false;
   },
   methods: {
+    // 选择支付方式的切换
+    handlePayTypeChange(e) {
+      console.log("e", e);
+      this.payType = Number(e.detail.value);
+    },
+    // 组合支付
+    handleCombinationPayment() {},
     // 切换tab
     handleChangeTab(value) {
       this.selectTab = value;
@@ -370,6 +416,7 @@ export default {
           return;
         }
       }
+
       if (this.isMakeOrdering) {
         uni.showToast({
           title: "请勿连续点击！",
@@ -496,12 +543,17 @@ export default {
       console.log("this.userInfo", this.userInfo);
       uni.hideLoading();
 
+      // 判断余额是否不足
+      let insufficientBalance = false;
+
       if (this.userInfo.ACCOUNT_BALANCE < Number(obj.PAY_AMOUNT)) {
-        uni.showToast({
+        insufficientBalance = true;
-          title: "余额不足！无法支付",
+        // uni.showToast({
-          icon: "none",
+        //   title: "余额不足！无法支付",
-        });
+        //   icon: "none",
-        return;
+        // });
+        // this.isMakeOrdering = false;
+        // return;
       }
 
       const req = {
@@ -509,22 +561,32 @@ export default {
         saleBill: obj.SALEBILL_ID,
         industryMembershipId: this.user.INDUSTRY_MEMBERSHIP_ID,
         requestType: "application/x-www-form-urlencoded",
+        mixPay: insufficientBalance ? 1 : "", // 组合支付的时候传1
       };
       const data = await this.$api.postCoop(req);
       console.log("data", data);
       if (data.ResultCode === "100") {
-        this.isMakeOrdering = false;
+        if (insufficientBalance) {
-        uni.showToast({
+          uni.showLoading({
-          title: "支付成功！",
+            title: "进行组合支付...",
-          icon: "none",
-        });
-        setTimeout(() => {
-          uni.redirectTo({
-            url: `/pages/order/orderdetail/index?orderInternal=${obj.SALEBILL_ID}`,
           });
-        }, 1500);
+          this.getOrderInfo(obj, data.ResultData);
+          uni.hideLoading();
+        } else {
+          this.isMakeOrdering = false;
+          uni.showToast({
+            title: "支付成功！",
+            icon: "none",
+          });
+          setTimeout(() => {
+            uni.redirectTo({
+              url: `/pages/order/orderdetail/index?orderInternal=${obj.SALEBILL_ID}`,
+            });
+          }, 1500);
+        }
       }
     },
+
     // 生成订单号
     generateOutTradeNo(length) {
       // 定义允许的字符集
@@ -549,7 +611,8 @@ export default {
     },
     // 生成一个符合要求的商户订单号（长度为16的示例）
     // 获取后台信息调取微信支付
-    async getOrderInfo(obj) {
+    async getOrderInfo(obj, payMoney) {
+      // payMoney 工会商城订单 组合支付时可能会出现的值
       let _this = this;
       console.log("_this.couponOrder", _this.couponOrder);
       // 拿到签名
@@ -568,7 +631,7 @@ export default {
         notify_url:
           "https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
         amount: {
-          total: Number(obj.PAY_AMOUNT) * 100 || 1,
+          total: payMoney ? payMoney * 100 : Number(obj.PAY_AMOUNT) * 100 || 1,
           currency: "CNY",
         }, // 订单金额
         payer: {
@@ -627,7 +690,9 @@ export default {
             package: `prepay_id=${res.data.prepay_id}`,
             signType: "RSA",
             paySign: paySign,
-            total_fee: Number(obj.PAY_AMOUNT) * 100 || 1,
+            total_fee: payMoney
+              ? payMoney * 100
+              : Number(obj.PAY_AMOUNT) * 100 || 1,
             success(res) {
               console.log("res", res);
             },
@@ -1178,6 +1243,32 @@ export default {
   background: #fefffe;
 }
 
+.payBox {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .label {
+    font-size: 14px;
+    font-weight: 600;
+  }
+  .selectBox {
+    display: flex;
+    align-items: center;
+    .pickerBox {
+      font-size: 28rpx;
+      font-family: "PingFang SC";
+      line-height: 34rpx;
+      color: #9fa3a8;
+    }
+    .rightIcon {
+      width: 18rpx;
+      height: 18rpx;
+      margin-left: 8rpx;
+    }
+  }
+}
+
 uni-modal .uni-modal__bd {
   white-space: pre-wrap;
 }

pages/user/index.vue

@@ -98,7 +98,7 @@
 
       <!-- 我的商城订单栏 -->
       <view class="orderFun">
-        <view class="boxTitleTop" @click="handleGoOrder(0)">
+        <view class="boxTitleTop" @click="handleGoOrder(0, '')">
           <text class="boxTitle">商城订单</text>
           <image class="rightArrow" src="/static/images/home/rightArrow.svg" />
         </view>
@@ -108,7 +108,7 @@
               class="orderFunItem"
               v-for="(item, index) in orderFunList"
               :key="index"
-              @click="handleGoOrder(item.value)"
+              @click="handleGoOrder(item.value, '')"
             >
               <image class="orderFunIcon" :src="item.src" />
               <text class="orderFunText">{{ item.label }}</text>
@@ -129,6 +129,43 @@
           </view>
         </view>
       </view>
+      <!-- 工会商城订单栏 -->
+      <view class="orderFun">
+        <view class="boxTitleTop" @click="handleGoOrder(0, 'UnionMall')">
+          <text class="boxTitle">工会订单</text>
+          <image class="rightArrow" src="/static/images/home/rightArrow.svg" />
+        </view>
+        <view class="orderContent">
+          <view class="orderLeft">
+            <view
+              class="orderFunItem"
+              v-for="(item, index) in orderFunList"
+              :key="index"
+              @click="handleGoOrder(item.value, 'UnionMall')"
+            >
+              <image class="orderFunIcon" :src="item.src" />
+              <text class="orderFunText">{{ item.label }}</text>
+            </view>
+          </view>
+
+          <!-- <view class="orderRight">
+            <view
+              class="orderFunItem"
+              @click="
+                handleGo(
+                  `/pages/order/buyOrder/index?type=6&pageType=UnionMall`
+                )
+              "
+            >
+              <image
+                class="orderFunIcon"
+                src="/static/images/home/afterSales.svg"
+              />
+              <text class="orderFunText">退换/售后</text>
+            </view>
+          </view> -->
+        </view>
+      </view>
 
       <!-- 我的点餐订单栏 -->
       <view class="orderFun">
@@ -440,14 +477,16 @@ export default {
       }
     },
     // 跳转订单
-    handleGoOrder(value) {
+    handleGoOrder(value, pageType) {
       if (value === 4) {
         uni.navigateTo({
-          url: `/pages/evaluateList/index`,
+          url: `/pages/evaluateList/index?pageType=${pageType}`,
         });
       } else {
         uni.navigateTo({
-          url: `/pages/order/buyOrder/index?type=${value || ""}`,
+          url: `/pages/order/buyOrder/index?type=${
+            value || ""
+          }&pageType=${pageType}`,
         });
       }
     },

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["components/tabbar"],{
 
-/***/ 349:
+/***/ 356:
 /*!*************************************************************!*\
   !*** D:/workfile/minprogram/caiyunyi/components/tabbar.vue ***!
   \*************************************************************/
@@ -9,10 +9,10 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _tabbar_vue_vue_type_template_id_852a8b4e_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./tabbar.vue?vue&type=template&id=852a8b4e&scoped=true& */ 350);
+/* harmony import */ var _tabbar_vue_vue_type_template_id_852a8b4e_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./tabbar.vue?vue&type=template&id=852a8b4e&scoped=true& */ 357);
-/* harmony import */ var _tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./tabbar.vue?vue&type=script&lang=js& */ 352);
+/* harmony import */ var _tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./tabbar.vue?vue&type=script&lang=js& */ 359);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _tabbar_vue_vue_type_style_index_0_id_852a8b4e_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./tabbar.vue?vue&type=style&index=0&id=852a8b4e&lang=less&scoped=true& */ 354);
+/* harmony import */ var _tabbar_vue_vue_type_style_index_0_id_852a8b4e_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./tabbar.vue?vue&type=style&index=0&id=852a8b4e&lang=less&scoped=true& */ 361);
 /* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 36);
 
 var renderjs
@@ -41,7 +41,7 @@ component.options.__file = "components/tabbar.vue"
 
 /***/ }),
 
-/***/ 350:
+/***/ 357:
 /*!********************************************************************************************************!*\
   !*** D:/workfile/minprogram/caiyunyi/components/tabbar.vue?vue&type=template&id=852a8b4e&scoped=true& ***!
   \********************************************************************************************************/
@@ -50,7 +50,7 @@ component.options.__file = "components/tabbar.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_template_id_852a8b4e_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./tabbar.vue?vue&type=template&id=852a8b4e&scoped=true& */ 351);
+/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_template_id_852a8b4e_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./tabbar.vue?vue&type=template&id=852a8b4e&scoped=true& */ 358);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_template_id_852a8b4e_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_template_id_852a8b4e_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +63,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 351:
+/***/ 358:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/workfile/minprogram/caiyunyi/components/tabbar.vue?vue&type=template&id=852a8b4e&scoped=true& ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -90,7 +90,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 352:
+/***/ 359:
 /*!**************************************************************************************!*\
   !*** D:/workfile/minprogram/caiyunyi/components/tabbar.vue?vue&type=script&lang=js& ***!
   \**************************************************************************************/
@@ -99,14 +99,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./tabbar.vue?vue&type=script&lang=js& */ 353);
+/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./tabbar.vue?vue&type=script&lang=js& */ 360);
 /* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 353:
+/***/ 360:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/workfile/minprogram/caiyunyi/components/tabbar.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -207,7 +207,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 354:
+/***/ 361:
 /*!***********************************************************************************************************************!*\
   !*** D:/workfile/minprogram/caiyunyi/components/tabbar.vue?vue&type=style&index=0&id=852a8b4e&lang=less&scoped=true& ***!
   \***********************************************************************************************************************/
@@ -216,14 +216,14 @@ exports.default = _default;
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_style_index_0_id_852a8b4e_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--10-oneOf-1-0!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--10-oneOf-1-1!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--10-oneOf-1-2!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--10-oneOf-1-3!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/less-loader/dist/cjs.js??ref--10-oneOf-1-4!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--10-oneOf-1-5!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./tabbar.vue?vue&type=style&index=0&id=852a8b4e&lang=less&scoped=true& */ 355);
+/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_style_index_0_id_852a8b4e_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--10-oneOf-1-0!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--10-oneOf-1-1!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--10-oneOf-1-2!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--10-oneOf-1-3!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/less-loader/dist/cjs.js??ref--10-oneOf-1-4!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--10-oneOf-1-5!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./tabbar.vue?vue&type=style&index=0&id=852a8b4e&lang=less&scoped=true& */ 362);
 /* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_style_index_0_id_852a8b4e_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_style_index_0_id_852a8b4e_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_style_index_0_id_852a8b4e_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_style_index_0_id_852a8b4e_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_tabbar_vue_vue_type_style_index_0_id_852a8b4e_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 355:
+/***/ 362:
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--10-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--10-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--10-oneOf-1-2!./node_modules/postcss-loader/src??ref--10-oneOf-1-3!./node_modules/less-loader/dist/cjs.js??ref--10-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--10-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/workfile/minprogram/caiyunyi/components/tabbar.vue?vue&type=style&index=0&id=852a8b4e&lang=less&scoped=true& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -242,7 +242,7 @@ __webpack_require__.r(__webpack_exports__);
     'components/tabbar-create-component',
     {
         'components/tabbar-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(349))
+            __webpack_require__('2')['createComponent'](__webpack_require__(356))
         })
     },
     [['components/tabbar-create-component']]

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

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

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

@@ -143,7 +143,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var lDragSort = function lDragSort() {
   __webpack_require__.e(/*! require.ensure | uni_modules/l-dragSort/components/l-dragSort/l-dragSort */ "uni_modules/l-dragSort/components/l-dragSort/l-dragSort").then((function () {
-    return resolve(__webpack_require__(/*! ../../uni_modules/l-dragSort/components/l-dragSort/l-dragSort.vue */ 356));
+    return resolve(__webpack_require__(/*! ../../uni_modules/l-dragSort/components/l-dragSort/l-dragSort.vue */ 363));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

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

@@ -101,7 +101,7 @@ 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))
+      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 */ 349))
     },
   }
 } catch (e) {
@@ -201,7 +201,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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; }
 var tabbar = function tabbar() {
   __webpack_require__.e(/*! require.ensure | components/tabbar */ "components/tabbar").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/tabbar.vue */ 349));
+    return resolve(__webpack_require__(/*! ../../components/tabbar.vue */ 356));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -351,11 +351,17 @@ var _default = {
             case 0:
               stronge = uni.getStorageSync("showIndexPoster");
               console.log("stronge", stronge);
-              if (stronge === 1 || stronge === "1" || new Date("2025-03-02 8:00:00").getTime() < new Date().getTime()) {
+              _this2.$refs.noticeRef.open("center");
-                _this2.showPoster = false;
+              // if (
-              } else {
+              //   stronge === 1 ||
-                _this2.$refs.noticeRef.open("center");
+              //   stronge === "1" ||
-              }
+              //   new Date("2025-03-02 8:00:00").getTime() < new Date().getTime()
+              // ) {
+              //   this.showPoster = false;
+              // } else {
+              //   this.$refs.noticeRef.open("center");
+              // }
+
               _this2.menu = uni.getMenuButtonBoundingClientRect();
               systemInfo = uni.getSystemInfoSync();
               console.log("systemInfo", systemInfo);

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

@@ -101,7 +101,7 @@ 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))
+      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 */ 349))
     },
   }
 } catch (e) {

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

@@ -301,7 +301,7 @@ var _default = {
                 });
                 req = {
                   action_type: "GetMallOrderList",
-                  salebillType: _this3.searchType === "6" ? 3999 : _this3.pageType === "UnionMall" ? 3001 : 3000,
+                  salebillType: _this3.searchType === "6" ? _this3.pageType === "UnionMall" ? 3001 : 3999 : _this3.pageType === "UnionMall" ? 3001 : 3000,
                   salebillState: _this3.searchType === "6" ? "" : status || "",
                   PageIndex: _this3.pageMsg.pageIndex,
                   pageSize: _this3.pageMsg.pageSize,

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

@@ -101,7 +101,7 @@ 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))
+      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 */ 349))
     },
   }
 } catch (e) {

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

@@ -101,7 +101,7 @@ 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))
+      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 */ 349))
     },
   }
 } catch (e) {
@@ -335,7 +335,7 @@ var _default = {
         this.getOrderInfo();
       }
     },
-    goPayment: function goPayment(obj) {
+    goPayment: function goPayment(obj, payMoney) {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
         var _this, mchid, timeStamp, nonceStr, serial_no, out_trade_no, req, reqSign, data, Authorization, AuthorizationStr;
@@ -374,7 +374,7 @@ var _default = {
                   notify_url: "https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx",
                   // 商户回调地址
                   amount: {
-                    total: Number(_this.tatalMoney) * 100 || 1,
+                    total: payMoney ? payMoney * 100 : Number(_this.tatalMoney) * 100 || 1,
                     currency: "CNY"
                   },
                   // 订单金额
@@ -431,7 +431,7 @@ var _default = {
                                 package: "prepay_id=".concat(res.data.prepay_id),
                                 signType: "RSA",
                                 paySign: paySign,
-                                total_fee: Number(_this.tatalMoney) * 100 || 1,
+                                total_fee: payMoney ? payMoney * 100 : Number(_this.tatalMoney) * 100 || 1,
                                 success: function success(res) {
                                   console.log("res", res);
                                 },
@@ -578,7 +578,8 @@ var _default = {
                       action_type: "UpdateOrderState",
                       action_data: _this.orderInfo.SALEBILL_ID,
                       saleBillChildId: _this.sellchildid > 0 ? _this.sellchildid : "",
-                      SALEBILL_STATE: 9999
+                      SALEBILL_STATE: 9999,
+                      mixPay: 1
                       // deliverDate: new Date()
                     };
                     _context4.next = 5;

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

@@ -165,7 +165,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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; }
 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 */ 363));
+    return resolve(__webpack_require__(/*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 349));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

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

@@ -101,7 +101,7 @@ 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))
+      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 */ 349))
     },
   }
 } catch (e) {
@@ -143,9 +143,17 @@ var render = function () {
       g6: g6,
     }
   })
-  var g7 = _vm.pageType !== "UnionMall" ? _vm.specialOffersList.length : null
+  var g7 =
-  var g8 = _vm.pageType !== "UnionMall" ? _vm.todayOffersList.length : null
+    _vm.haveActivity && _vm.pageType !== "UnionMall"
-  var g9 =
+      ? _vm.activityShopList && _vm.activityShopList.length > 0
+      : null
+  var g8 =
+    _vm.haveActivity && _vm.pageType !== "UnionMall" && g7
+      ? _vm.activityShopList.length
+      : null
+  var g9 = _vm.pageType !== "UnionMall" ? _vm.specialOffersList.length : null
+  var g10 = _vm.pageType !== "UnionMall" ? _vm.todayOffersList.length : null
+  var g11 =
     _vm.pageType === "UnionMall"
       ? _vm.showShopList && _vm.showShopList.length > 0
       : null
@@ -163,6 +171,8 @@ var render = function () {
         g7: g7,
         g8: g8,
         g9: g9,
+        g10: g10,
+        g11: g11,
       },
     }
   )
@@ -310,7 +320,13 @@ var _default = {
       showBackTop: false,
       // 页面滚动距离
       scrollView: "",
-      safeHeight: 0 // ios的安全距离
+      safeHeight: 0,
+      // ios的安全距离
+      haveActivity: false,
+      // 是否有活动
+      activityObj: {},
+      // 活动项的具体内容
+      activityShopList: [] // 活动商品列表
     };
   },
   onLoad: function onLoad(query) {
@@ -328,7 +344,7 @@ var _default = {
               firstEntry = uni.getStorageSync("firstEntry");
               if (firstEntry === "2") {} else {
                 _this2.isFirst = true;
-                _this2.$refs.noticeRef.open("center");
+                // this.$refs.noticeRef.open("center");
                 uni.setStorageSync("firstEntry", "2");
               }
               safeHeight = uni.getStorageSync("safeHeight");
@@ -406,7 +422,7 @@ var _default = {
               // ];
               // 拿到工会商城的商品列表
               _this2.handleGetUnionShopList();
-              _context.next = 27;
+              _context.next = 28;
               break;
             case 22:
               _context.next = 24;
@@ -418,7 +434,10 @@ var _default = {
               _this2.handleGetTodayOffers();
               // 最下面的甄选商品
               _this2.handleGetProductsList();
-            case 27:
+              if (_this2.haveActivity) {
+                _this2.handleGetActivityList();
+              }
+            case 28:
             case "end":
               return _context.stop();
           }
@@ -751,7 +770,7 @@ var _default = {
     handleGetShopBigType: function handleGetShopBigType() {
       var _this7 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
-        var data, typeList, resList, indexOfList;
+        var data, typeList, resList, activityObj, indexOfList;
         return _regenerator.default.wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
@@ -766,18 +785,28 @@ var _default = {
                 data = _context6.sent;
                 console.log("handleGetShopBigType", data);
                 typeList = data.Data.List;
-                resList = [];
+                resList = []; // 如果有活动的话就有值
-                indexOfList = [1248, 1247, 1257, 1245, 1246, 1355];
+                activityObj = {};
+                indexOfList = [1248, 1247, 1257, 1245, 1246]; // , 1355
                 if (typeList && typeList.length > 0) {
                   typeList.forEach(function (item) {
                     if (indexOfList.indexOf(item.UserdefinedType_Id) !== -1) {
                       resList.push(item);
                     }
+                    if (item.UserdefinedType_Id === 1355) {
+                      _this7.haveActivity = true;
+                      activityObj = item;
+                    }
                   });
                 }
+                if (_this7.haveActivity) {
+                  // resList.push(activityObj);
+                  _this7.activityObj = activityObj;
+                }
                 _this7.shopTypeList = resList;
                 _this7.selectProducts = resList[0].UserdefinedType_Id;
-                console.log("this.selectProducts", _this7.selectProducts);
+                console.log("this.shopTypeList", _this7.shopTypeList);
+                console.log("this.activityObj", _this7.activityObj);
 
                 // if (this.shopTypeList && this.shopTypeList.length < 10) {
                 //   this.oneRowNumber = this.shopTypeList.length;
@@ -785,7 +814,7 @@ var _default = {
                 //   this.oneRowNumber = Math.ceil(this.shopTypeList.length / 2);
                 // }
                 // console.log("this.oneRowNumber", this.oneRowNumber);
-              case 11:
+              case 14:
               case "end":
                 return _context6.stop();
             }
@@ -793,11 +822,11 @@ var _default = {
         }, _callee6);
       }))();
     },
-    // 拿到特价优惠的商品列表 nature 5030
+    // 拿到活动的商品列表 可能不调用 有判断的
-    handleGetSpecialOffers: function handleGetSpecialOffers() {
+    handleGetActivityList: function handleGetActivityList() {
       var _this8 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
-        var data, list, shopList;
+        var data, list, res;
         return _regenerator.default.wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
@@ -806,12 +835,58 @@ var _default = {
                 return _this8.$api.getCoop({
                   action_type: "WeChat_GetMallGoodsInfo",
                   ownerUnitId: 911,
-                  COMMODITYNATURE: 5030,
+                  userdefinedtypeId: 1355,
                   excludeNature: 5070,
                   justCommodity: 1
                 });
               case 2:
                 data = _context7.sent;
+                console.log("handleGetActivityList", data);
+                list = data.Data.List;
+                res = [];
+                if (list && list.length > 0) {
+                  list.forEach(function (item) {
+                    if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
+                      item.COMMODITYLIST.forEach(function (subItem) {
+                        if (subItem.COMMODITY_MEMBERPRICE && subItem.COMMODITY_MEMBERPRICE.toString().indexOf(".") !== -1) {
+                          subItem.bigNumber = subItem.COMMODITY_MEMBERPRICE.toString().split(".")[0];
+                          subItem.smallNumber = subItem.COMMODITY_MEMBERPRICE.toString().split(".")[1];
+                        } else {
+                          subItem.bigNumber = subItem.COMMODITY_MEMBERPRICE;
+                        }
+                        res.push(subItem);
+                      });
+                    }
+                  });
+                }
+                _this8.activityShopList = res;
+              case 8:
+              case "end":
+                return _context7.stop();
+            }
+          }
+        }, _callee7);
+      }))();
+    },
+    // 拿到特价优惠的商品列表 nature 5030
+    handleGetSpecialOffers: function handleGetSpecialOffers() {
+      var _this9 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
+        var data, list, shopList;
+        return _regenerator.default.wrap(function _callee8$(_context8) {
+          while (1) {
+            switch (_context8.prev = _context8.next) {
+              case 0:
+                _context8.next = 2;
+                return _this9.$api.getCoop({
+                  action_type: "WeChat_GetMallGoodsInfo",
+                  ownerUnitId: 911,
+                  COMMODITYNATURE: 5030,
+                  excludeNature: 5070,
+                  justCommodity: 1
+                });
+              case 2:
+                data = _context8.sent;
                 console.log("handleGetSpecialOffers", data);
                 list = data.Data && data.Data.List ? data.Data.List : [];
                 shopList = [];
@@ -837,26 +912,26 @@ var _default = {
                   });
                 }
                 console.log("特价优惠", shopList);
-                _this8.specialOffersList = shopList;
+                _this9.specialOffersList = shopList;
               case 9:
               case "end":
-                return _context7.stop();
+                return _context8.stop();
             }
           }
-        }, _callee7);
+        }, _callee8);
       }))();
     },
     // 拿到今日推荐的商品列表 nature 5050
     handleGetTodayOffers: function handleGetTodayOffers() {
-      var _this9 = this;
+      var _this10 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
         var data, list, shopList, obj, _shopList;
-        return _regenerator.default.wrap(function _callee8$(_context8) {
+        return _regenerator.default.wrap(function _callee9$(_context9) {
           while (1) {
-            switch (_context8.prev = _context8.next) {
+            switch (_context9.prev = _context9.next) {
               case 0:
-                _context8.next = 2;
+                _context9.next = 2;
-                return _this9.$api.getCoop({
+                return _this10.$api.getCoop({
                   action_type: "WeChat_GetMallGoodsInfo",
                   ownerUnitId: 911,
                   COMMODITYNATURE: 5050,
@@ -864,7 +939,7 @@ var _default = {
                   justCommodity: 1
                 });
               case 2:
-                data = _context8.sent;
+                data = _context9.sent;
                 console.log("今日推荐", data);
                 list = data.Data.List;
                 shopList = [];
@@ -890,14 +965,14 @@ var _default = {
                   });
                 }
                 console.log("今日推荐", shopList);
-                _this9.todayOffersList = shopList;
+                _this10.todayOffersList = shopList;
-                return _context8.abrupt("return");
+                return _context9.abrupt("return");
               case 12:
               case "end":
-                return _context8.stop();
+                return _context9.stop();
             }
           }
-        }, _callee8);
+        }, _callee9);
       }))();
     },
     // 切换甄选商品的类型
@@ -912,34 +987,34 @@ var _default = {
     },
     // 拿到甄选商品  3000
     handleGetProductsList: function handleGetProductsList() {
-      var _this10 = this;
+      var _this11 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
         var data, list, resList, thisResList;
-        return _regenerator.default.wrap(function _callee9$(_context9) {
+        return _regenerator.default.wrap(function _callee10$(_context10) {
           while (1) {
-            switch (_context9.prev = _context9.next) {
+            switch (_context10.prev = _context10.next) {
               case 0:
                 uni.showLoading({
                   title: "加载中"
                 });
-                _context9.next = 3;
+                _context10.next = 3;
-                return _this10.$api.getCoop({
+                return _this11.$api.getCoop({
                   action_type: "WeChat_GetMallGoodsInfo",
                   ownerUnitId: 911,
                   COMMODITYNATURE: 3000,
-                  userdefinedtypeId: _this10.selectProducts || "",
+                  userdefinedtypeId: _this11.selectProducts || "",
-                  Page_Size: _this10.shopMsg.pageSize,
+                  Page_Size: _this11.shopMsg.pageSize,
-                  Page_Index: _this10.shopMsg.pageIndex,
+                  Page_Index: _this11.shopMsg.pageIndex,
                   justCommodity: 1
                   // excludeNature: 5070,
                 });
               case 3:
-                data = _context9.sent;
+                data = _context10.sent;
                 list = data.Data.List;
                 resList = [];
                 thisResList = [];
-                if (_this10.shopMsg.pageIndex > 1) {
+                if (_this11.shopMsg.pageIndex > 1) {
-                  resList = _this10.productsList;
+                  resList = _this11.productsList;
                 }
                 if (list && list.length > 0) {
                   // this.selectProducts = list[0].UserdefinedType_Id;
@@ -964,10 +1039,10 @@ var _default = {
                   });
                 }
                 if (thisResList && thisResList.length < 6) {
-                  _this10.shopMsg.isOver = true;
+                  _this11.shopMsg.isOver = true;
                 }
                 // this.productsList = list;
-                _this10.productsList = resList.concat(thisResList);
+                _this11.productsList = resList.concat(thisResList);
                 console.log("甄选商品", list);
                 uni.hideLoading();
 
@@ -983,10 +1058,10 @@ var _default = {
                 // }
               case 13:
               case "end":
-                return _context9.stop();
+                return _context10.stop();
             }
           }
-        }, _callee9);
+        }, _callee10);
       }))();
     },
     // 返回首页
@@ -1034,6 +1109,12 @@ var _default = {
         });
       }
     },
+    // 活动直接跳转分类页面 分类页面的互动是第一个 所以 selectIndex 传0就好
+    handleGoActivityType: function handleGoActivityType() {
+      uni.redirectTo({
+        url: "/pages/shopMallPage/shopType/index?selectIndex=".concat(0, "&pageType=", this.pageType)
+      });
+    },
     // 跳转工会商城
     handleGoUnionMall: function handleGoUnionMall() {
       uni.navigateTo({

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

@@ -290,6 +290,11 @@
   align-items: center;
   justify-content: space-between;
 }
+.main .pageContent .advertisement .advertisementContentBox .advertisementTop .title.data-v-79c11018 {
+  font-size: 14px;
+  font-weight: 600;
+  color: #181716;
+}
 .main .pageContent .advertisement .advertisementContentBox .advertisementTop .title .titleImg.data-v-79c11018 {
   width: 112rpx;
   height: 36rpx;

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

@@ -101,7 +101,7 @@ 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))
+      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 */ 349))
     },
   }
 } catch (e) {
@@ -754,11 +754,11 @@ var _default = {
           });
           return;
         } else if (this.totalPay > Number(this.userInfo.ACCOUNT_BALANCE)) {
-          uni.showToast({
+          // uni.showToast({
-            title: "账户余额不足！",
+          //   title: "账户余额不足！",
-            icon: "none"
+          //   icon: "none",
-          });
+          // });
-          return;
+          // return;
         }
       }
       console.log("this.shopList", this.shopList);

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

@@ -80,7 +80,7 @@ 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))
+      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 */ 349))
     },
   }
 } catch (e) {

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

@@ -101,7 +101,7 @@ 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))
+      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 */ 349))
     },
   }
 } catch (e) {
@@ -263,7 +263,16 @@ var _default = {
       // 1 是 配送  2 到店自取
       phoneNumber: "",
       // 当前用户的默认手机号
-      isMakeOrdering: false
+      isMakeOrdering: false,
+      payType: 0,
+      // 默认是立即下单
+      payTypeList: [{
+        label: "立即下单",
+        value: 1
+      }, {
+        label: "组合支付",
+        value: 2
+      }]
     };
   },
   computed: _objectSpread(_objectSpread({}, (0, _vuex.mapGetters)({
@@ -334,6 +343,13 @@ var _default = {
     }))();
   },
   methods: {
+    // 选择支付方式的切换
+    handlePayTypeChange: function handlePayTypeChange(e) {
+      console.log("e", e);
+      this.payType = Number(e.detail.value);
+    },
+    // 组合支付
+    handleCombinationPayment: function handleCombinationPayment() {},
     // 切换tab
     handleChangeTab: function handleChangeTab(value) {
       this.selectTab = value;
@@ -592,7 +608,7 @@ var _default = {
     handleBalancePayment: function handleBalancePayment(obj) {
       var _this6 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
-        var userData, req, data;
+        var userData, insufficientBalance, req, data;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
@@ -614,40 +630,51 @@ var _default = {
                 _this6.userInfo = userData.Data;
                 console.log("this.userInfo", _this6.userInfo);
                 uni.hideLoading();
-                if (!(_this6.userInfo.ACCOUNT_BALANCE < Number(obj.PAY_AMOUNT))) {
+
-                  _context4.next = 12;
+                // 判断余额是否不足
-                  break;
+                insufficientBalance = false;
+                if (_this6.userInfo.ACCOUNT_BALANCE < Number(obj.PAY_AMOUNT)) {
+                  insufficientBalance = true;
+                  // uni.showToast({
+                  //   title: "余额不足！无法支付",
+                  //   icon: "none",
+                  // });
+                  // this.isMakeOrdering = false;
+                  // return;
                 }
-                uni.showToast({
-                  title: "余额不足！无法支付",
-                  icon: "none"
-                });
-                return _context4.abrupt("return");
-              case 12:
                 req = {
                   action_type: "ECodeConsume",
                   saleBill: obj.SALEBILL_ID,
                   industryMembershipId: _this6.user.INDUSTRY_MEMBERSHIP_ID,
-                  requestType: "application/x-www-form-urlencoded"
+                  requestType: "application/x-www-form-urlencoded",
+                  mixPay: insufficientBalance ? 1 : "" // 组合支付的时候传1
                 };
-                _context4.next = 15;
+                _context4.next = 14;
                 return _this6.$api.postCoop(req);
-              case 15:
+              case 14:
                 data = _context4.sent;
                 console.log("data", data);
                 if (data.ResultCode === "100") {
-                  _this6.isMakeOrdering = false;
+                  if (insufficientBalance) {
-                  uni.showToast({
+                    uni.showLoading({
-                    title: "支付成功！",
+                      title: "进行组合支付..."
-                    icon: "none"
-                  });
-                  setTimeout(function () {
-                    uni.redirectTo({
-                      url: "/pages/order/orderdetail/index?orderInternal=".concat(obj.SALEBILL_ID)
                     });
-                  }, 1500);
+                    _this6.getOrderInfo(obj, data.ResultData);
+                    uni.hideLoading();
+                  } else {
+                    _this6.isMakeOrdering = false;
+                    uni.showToast({
+                      title: "支付成功！",
+                      icon: "none"
+                    });
+                    setTimeout(function () {
+                      uni.redirectTo({
+                        url: "/pages/order/orderdetail/index?orderInternal=".concat(obj.SALEBILL_ID)
+                      });
+                    }, 1500);
+                  }
                 }
-              case 18:
+              case 17:
               case "end":
                 return _context4.stop();
             }
@@ -677,7 +704,7 @@ var _default = {
     },
     // 生成一个符合要求的商户订单号（长度为16的示例）
     // 获取后台信息调取微信支付
-    getOrderInfo: function getOrderInfo(obj) {
+    getOrderInfo: function getOrderInfo(obj, payMoney) {
       var _this7 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
         var _this, mchid, timeStamp, nonceStr, serial_no, out_trade_no, req, reqSign, data, Authorization, AuthorizationStr;
@@ -685,6 +712,7 @@ var _default = {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
+                // payMoney 工会商城订单 组合支付时可能会出现的值
                 _this = _this7;
                 console.log("_this.couponOrder", _this.couponOrder);
                 // 拿到签名
@@ -705,7 +733,7 @@ var _default = {
                   notify_url: "https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx",
                   // 商户回调地址
                   amount: {
-                    total: Number(obj.PAY_AMOUNT) * 100 || 1,
+                    total: payMoney ? payMoney * 100 : Number(obj.PAY_AMOUNT) * 100 || 1,
                     currency: "CNY"
                   },
                   // 订单金额
@@ -762,7 +790,7 @@ var _default = {
                                 package: "prepay_id=".concat(res.data.prepay_id),
                                 signType: "RSA",
                                 paySign: paySign,
-                                total_fee: Number(obj.PAY_AMOUNT) * 100 || 1,
+                                total_fee: payMoney ? payMoney * 100 : Number(obj.PAY_AMOUNT) * 100 || 1,
                                 success: function success(res) {
                                   console.log("res", res);
                                 },

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

@@ -409,6 +409,31 @@
   margin: auto;
   background: #fefffe;
 }
+.payBox.data-v-43036aa6 {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.payBox .label.data-v-43036aa6 {
+  font-size: 14px;
+  font-weight: 600;
+}
+.payBox .selectBox.data-v-43036aa6 {
+  display: flex;
+  align-items: center;
+}
+.payBox .selectBox .pickerBox.data-v-43036aa6 {
+  font-size: 28rpx;
+  font-family: "PingFang SC";
+  line-height: 34rpx;
+  color: #9fa3a8;
+}
+.payBox .selectBox .rightIcon.data-v-43036aa6 {
+  width: 18rpx;
+  height: 18rpx;
+  margin-left: 8rpx;
+}
 uni-modal .uni-modal__bd.data-v-43036aa6 {
   white-space: pre-wrap;
 }

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

@@ -150,7 +150,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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; }
 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 */ 363));
+    return resolve(__webpack_require__(/*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 349));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

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

@@ -215,7 +215,7 @@ var card = function card() {
 };
 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 */ 363));
+    return resolve(__webpack_require__(/*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 349));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

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

@@ -101,7 +101,7 @@ 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))
+      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 */ 349))
     },
   }
 } catch (e) {

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

@@ -200,7 +200,7 @@ var MerchantEvaluation = function MerchantEvaluation() {
 };
 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 */ 363));
+    return resolve(__webpack_require__(/*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 349));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

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

@@ -163,7 +163,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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; }
 var tabbar = function tabbar() {
   __webpack_require__.e(/*! require.ensure | components/tabbar */ "components/tabbar").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/tabbar.vue */ 349));
+    return resolve(__webpack_require__(/*! ../../components/tabbar.vue */ 356));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -410,14 +410,14 @@ var _default = {
       }
     },
     // 跳转订单
-    handleGoOrder: function handleGoOrder(value) {
+    handleGoOrder: function handleGoOrder(value, pageType) {
       if (value === 4) {
         uni.navigateTo({
-          url: "/pages/evaluateList/index"
+          url: "/pages/evaluateList/index?pageType=".concat(pageType)
         });
       } else {
         uni.navigateTo({
-          url: "/pages/order/buyOrder/index?type=".concat(value || "")
+          url: "/pages/order/buyOrder/index?type=".concat(value || "", "&pageType=").concat(pageType)
         });
       }
     },

unpackage/dist/dev/mp-weixin/uni_modules/l-dragSort/components/l-dragSort/l-dragSort.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/l-dragSort/components/l-dragSort/l-dragSort"],{
 
-/***/ 356:
+/***/ 363:
 /*!***************************************************************************************************!*\
   !*** D:/workfile/minprogram/caiyunyi/uni_modules/l-dragSort/components/l-dragSort/l-dragSort.vue ***!
   \***************************************************************************************************/
@@ -9,10 +9,10 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _l_dragSort_vue_vue_type_template_id_8cd2ec86_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./l-dragSort.vue?vue&type=template&id=8cd2ec86&scoped=true& */ 357);
+/* harmony import */ var _l_dragSort_vue_vue_type_template_id_8cd2ec86_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./l-dragSort.vue?vue&type=template&id=8cd2ec86&scoped=true& */ 364);
-/* harmony import */ var _l_dragSort_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./l-dragSort.vue?vue&type=script&lang=js& */ 359);
+/* harmony import */ var _l_dragSort_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./l-dragSort.vue?vue&type=script&lang=js& */ 366);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _l_dragSort_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _l_dragSort_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _l_dragSort_vue_vue_type_style_index_0_id_8cd2ec86_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./l-dragSort.vue?vue&type=style&index=0&id=8cd2ec86&scoped=true&lang=scss& */ 361);
+/* harmony import */ var _l_dragSort_vue_vue_type_style_index_0_id_8cd2ec86_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./l-dragSort.vue?vue&type=style&index=0&id=8cd2ec86&scoped=true&lang=scss& */ 368);
 /* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 36);
 
 var renderjs
@@ -41,7 +41,7 @@ component.options.__file = "uni_modules/l-dragSort/components/l-dragSort/l-dragS
 
 /***/ }),
 
-/***/ 357:
+/***/ 364:
 /*!**********************************************************************************************************************************************!*\
   !*** D:/workfile/minprogram/caiyunyi/uni_modules/l-dragSort/components/l-dragSort/l-dragSort.vue?vue&type=template&id=8cd2ec86&scoped=true& ***!
   \**********************************************************************************************************************************************/
@@ -50,7 +50,7 @@ component.options.__file = "uni_modules/l-dragSort/components/l-dragSort/l-dragS
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_template_id_8cd2ec86_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-dragSort.vue?vue&type=template&id=8cd2ec86&scoped=true& */ 358);
+/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_template_id_8cd2ec86_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-dragSort.vue?vue&type=template&id=8cd2ec86&scoped=true& */ 365);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_template_id_8cd2ec86_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_template_id_8cd2ec86_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +63,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 358:
+/***/ 365:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/workfile/minprogram/caiyunyi/uni_modules/l-dragSort/components/l-dragSort/l-dragSort.vue?vue&type=template&id=8cd2ec86&scoped=true& ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -99,7 +99,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 359:
+/***/ 366:
 /*!****************************************************************************************************************************!*\
   !*** D:/workfile/minprogram/caiyunyi/uni_modules/l-dragSort/components/l-dragSort/l-dragSort.vue?vue&type=script&lang=js& ***!
   \****************************************************************************************************************************/
@@ -108,14 +108,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-dragSort.vue?vue&type=script&lang=js& */ 360);
+/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-dragSort.vue?vue&type=script&lang=js& */ 367);
 /* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 360:
+/***/ 367:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/workfile/minprogram/caiyunyi/uni_modules/l-dragSort/components/l-dragSort/l-dragSort.vue?vue&type=script&lang=js& ***!
   \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -391,7 +391,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 361:
+/***/ 368:
 /*!*************************************************************************************************************************************************************!*\
   !*** D:/workfile/minprogram/caiyunyi/uni_modules/l-dragSort/components/l-dragSort/l-dragSort.vue?vue&type=style&index=0&id=8cd2ec86&scoped=true&lang=scss& ***!
   \*************************************************************************************************************************************************************/
@@ -400,14 +400,14 @@ exports.default = _default;
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_style_index_0_id_8cd2ec86_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--8-oneOf-1-3!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-dragSort.vue?vue&type=style&index=0&id=8cd2ec86&scoped=true&lang=scss& */ 362);
+/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_style_index_0_id_8cd2ec86_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--8-oneOf-1-3!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-dragSort.vue?vue&type=style&index=0&id=8cd2ec86&scoped=true&lang=scss& */ 369);
 /* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_style_index_0_id_8cd2ec86_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_style_index_0_id_8cd2ec86_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_style_index_0_id_8cd2ec86_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_style_index_0_id_8cd2ec86_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_dragSort_vue_vue_type_style_index_0_id_8cd2ec86_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 362:
+/***/ 369:
 /*!*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/workfile/minprogram/caiyunyi/uni_modules/l-dragSort/components/l-dragSort/l-dragSort.vue?vue&type=style&index=0&id=8cd2ec86&scoped=true&lang=scss& ***!
   \*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -426,7 +426,7 @@ __webpack_require__.r(__webpack_exports__);
     'uni_modules/l-dragSort/components/l-dragSort/l-dragSort-create-component',
     {
         'uni_modules/l-dragSort/components/l-dragSort/l-dragSort-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(356))
+            __webpack_require__('2')['createComponent'](__webpack_require__(363))
         })
     },
     [['uni_modules/l-dragSort/components/l-dragSort/l-dragSort-create-component']]

unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/uni-popup/components/uni-popup/uni-popup"],{
 
-/***/ 363:
+/***/ 349:
 /*!************************************************************************************************!*\
   !*** D:/workfile/minprogram/caiyunyi/uni_modules/uni-popup/components/uni-popup/uni-popup.vue ***!
   \************************************************************************************************/
@@ -9,10 +9,10 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _uni_popup_vue_vue_type_template_id_7c43d41b___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./uni-popup.vue?vue&type=template&id=7c43d41b& */ 364);
+/* harmony import */ var _uni_popup_vue_vue_type_template_id_7c43d41b___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./uni-popup.vue?vue&type=template&id=7c43d41b& */ 350);
-/* harmony import */ var _uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-popup.vue?vue&type=script&lang=js& */ 366);
+/* harmony import */ var _uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-popup.vue?vue&type=script&lang=js& */ 352);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _uni_popup_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-popup.vue?vue&type=style&index=0&lang=scss& */ 368);
+/* harmony import */ var _uni_popup_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-popup.vue?vue&type=style&index=0&lang=scss& */ 354);
 /* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 36);
 
 var renderjs
@@ -41,7 +41,7 @@ component.options.__file = "uni_modules/uni-popup/components/uni-popup/uni-popup
 
 /***/ }),
 
-/***/ 364:
+/***/ 350:
 /*!*******************************************************************************************************************************!*\
   !*** D:/workfile/minprogram/caiyunyi/uni_modules/uni-popup/components/uni-popup/uni-popup.vue?vue&type=template&id=7c43d41b& ***!
   \*******************************************************************************************************************************/
@@ -50,7 +50,7 @@ component.options.__file = "uni_modules/uni-popup/components/uni-popup/uni-popup
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_template_id_7c43d41b___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-popup.vue?vue&type=template&id=7c43d41b& */ 365);
+/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_template_id_7c43d41b___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-popup.vue?vue&type=template&id=7c43d41b& */ 351);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_template_id_7c43d41b___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_template_id_7c43d41b___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +63,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 365:
+/***/ 351:
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/workfile/minprogram/caiyunyi/uni_modules/uni-popup/components/uni-popup/uni-popup.vue?vue&type=template&id=7c43d41b& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -113,7 +113,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 366:
+/***/ 352:
 /*!*************************************************************************************************************************!*\
   !*** D:/workfile/minprogram/caiyunyi/uni_modules/uni-popup/components/uni-popup/uni-popup.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************/
@@ -122,14 +122,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-popup.vue?vue&type=script&lang=js& */ 367);
+/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-popup.vue?vue&type=script&lang=js& */ 353);
 /* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_program_files_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 367:
+/***/ 353:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/workfile/minprogram/caiyunyi/uni_modules/uni-popup/components/uni-popup/uni-popup.vue?vue&type=script&lang=js& ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -552,7 +552,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 368:
+/***/ 354:
 /*!**********************************************************************************************************************************!*\
   !*** D:/workfile/minprogram/caiyunyi/uni_modules/uni-popup/components/uni-popup/uni-popup.vue?vue&type=style&index=0&lang=scss& ***!
   \**********************************************************************************************************************************/
@@ -561,14 +561,14 @@ exports.default = _default;
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--8-oneOf-1-3!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-popup.vue?vue&type=style&index=0&lang=scss& */ 369);
+/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--8-oneOf-1-3!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-popup.vue?vue&type=style&index=0&lang=scss& */ 355);
 /* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_popup_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 369:
+/***/ 355:
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/workfile/minprogram/caiyunyi/uni_modules/uni-popup/components/uni-popup/uni-popup.vue?vue&type=style&index=0&lang=scss& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -587,7 +587,7 @@ __webpack_require__.r(__webpack_exports__);
     'uni_modules/uni-popup/components/uni-popup/uni-popup-create-component',
     {
         'uni_modules/uni-popup/components/uni-popup/uni-popup-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(363))
+            __webpack_require__('2')['createComponent'](__webpack_require__(349))
         })
     },
     [['uni_modules/uni-popup/components/uni-popup/uni-popup-create-component']]