2021.10.15

.hbuilderx/launch.json

@@ -2,10 +2,19 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "remote"
-            }
-        }
+     	"default" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"mp-alipay" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"type" : "uniCloud"
+     }
     ]
 }

App.vue

@@ -19,8 +19,9 @@
         that.updateManager.onCheckForUpdate(function(res) {
           if (res.hasUpdate) {
             wx.showModal({
-              title: '更新提示',
+              title: '升级提示',
               content: '检测到新版本，是否下载新版本并重启小程序？',
+              showCancel:false,
               success: function(res) {
                 if (res.confirm) {
                   that.downLoadAndUpdateApplet()
@@ -48,11 +49,19 @@
     }
     downLoadAndUpdateApplet() {
       const that = this;
-      wx.showLoading();
-      that.updateManager.onUpdateReady(function() {
-        wx.hideLoading();
-        that.updateManager.applyUpdate()
+      wx.showModal({
+        title: '升级提示',
+        showCancel:false,
+        content: '如果小程序自动升级失败~请您手动删除当前小程序后，重新打开小程序~',
+        success:function(res){
+          wx.showLoading();
+          that.updateManager.onUpdateReady(function() {
+            wx.hideLoading();
+            that.updateManager.applyUpdate()
+          })
+        }
       })
+      
       that.updateManager.onUpdateFailed(function() {
         wx.hideLoading();
         wx.showModal({

pages.json

@@ -5,68 +5,57 @@
       "^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue"
     }
   },
-  "pages": [
-    {
+  "pages": [{
       "path": "pages/list/list",
       "style": {
         "navigationBarTitleText": "油站列表",
         "enablePullDownRefresh": false
       }
-    },{
-    "path": "pages/index/index",
-    "style": {
-      "navigationBarTitleText": "一键加油"
-    }
-  },
+    }, {
+      "path": "pages/index/index",
+      "style": {
+        "navigationBarTitleText": "一键加油"
+      }
+    },
     {
-    "path": "pages/test/test",
-    "style": {
-      "navigationBarTitleText": "测试页",
-      "enablePullDownRefresh": false
-    }
-  }, {
-    "path": "pages/succeed/succeed",
-    "style": {
-      "navigationBarTitleText": "支付成功",
-      "enablePullDownRefresh": false
-    }
-  }, {
-    "path": "pages/authen/identity",
-    "style": {
-      "navigationBarTitleText": "请求授权",
-      "enablePullDownRefresh": false
-    }
-  }, {
-    "path": "pages/authen/login",
-    "style": {
-      "navigationBarTitleText": "登录",
-      "enablePullDownRefresh": false
-    }
-  }, {
-    "path": "pages/confirm/confirm",
-    "style": {
-      "navigationBarTitleText": "订单确认",
-      "enablePullDownRefresh": false
+      "path": "pages/test/test",
+      "style": {
+        "navigationBarTitleText": "测试页",
+        "enablePullDownRefresh": false
+      }
+    }, {
+      "path": "pages/succeed/succeed",
+      "style": {
+        "navigationBarTitleText": "支付成功",
+        "enablePullDownRefresh": false
+      }
+    }, {
+      "path": "pages/authen/identity",
+      "style": {
+        "navigationBarTitleText": "请求授权",
+        "enablePullDownRefresh": false
+      }
+    }, {
+      "path": "pages/authen/login",
+      "style": {
+        "navigationBarTitleText": "登录",
+        "enablePullDownRefresh": false
+      }
+    }, {
+      "path": "pages/confirm/confirm",
+      "style": {
+        "navigationBarTitleText": "订单确认",
+        "enablePullDownRefresh": false
+      }
+    }, {
+      "path": "pages/skip/skip",
+      "style": {
+        "navigationBarTitleText": "跳转中",
+        "enablePullDownRefresh": false
+      }
+
     }
-  }    ,{
-            "path" : "pages/skip/skip",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/succeed1/succeed1",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+  ],
   "globalStyle": {
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "uni-app",

pages/authen/identity.vue

@@ -4,7 +4,12 @@
     <view class="hr"></view>
     <view class="content">
       <text>申请获取以下权限</text>
+      <!--  #ifdef  MP-WEIXIN -->
       <text>获得你的公开信息（昵称、头像、地区等）</text>
+      <!--  #endif -->
+      <!--  #ifdef  MP-ALIPAY -->
+      <text>获得你的公开信息（昵称、头像、地区等）</text>
+      <!--  #endif -->
     </view>
     <!--  #ifdef  MP-WEIXIN -->
     <button :loading="getUserInfoLoading" :disabled="getUserInfoLoading" @click="getUserInfo">
@@ -13,17 +18,15 @@
     <!--  #endif -->
 
     <!--  #ifdef  MP-ALIPAY -->
-    <button :loading="getUserInfoLoading" :disabled="getUserInfoLoading" open-type="getAuthorize" scope="userInfo"
+    <!--
+    <button :loading="getUserInfoLoading"  open-type="getAuthorize" scope="userInfo"
       @getAuthorize="getUserInfo" @onError="onAuthError">
-      支付宝授权获取
-    </button>
-    <button  @click="getCode">
-      code获取
+      本地授权获取
     </button>
-    <button  @click="getCode" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
-      手机号获取
-    </button>
-    
+    -->
+    <button  @click="getAliInfo" :loading="getUserInfoLoading" :disabled="getUserInfoLoading">
+      授权获取
+    </button>    
     <!--  #endif -->
     
 
@@ -70,56 +73,70 @@
       this.code = loginData.code
     },
     methods: {
-      getPhoneNumber(){
-        my.getPhoneNumber({
-            success: (res) => {
-                let encryptedData = res.response;
-                  console.log(encryptedData)
-            },
-            fail: (res) => {
-                console.log(res);
-                console.log('getPhoneNumber_fail');
-            },
-        });
-
-      },
-      getCode(){
+      ...mapMutations({
+        updateUserInfo: "updateUserInfo",
+        clearUserInfo: "clearUserInfo"
+      }),
+      ...mapMutations({
+        updateOpenId: "updateOpenId",
+        updateUnionId: "updateUnionId",
+        updateUserInfo: "updateUserInfo",
+        updatePhoneNumber: "updatePhoneNumber",
+        updateCountryCode: "updateCountryCode",
+        updatePurePhoneNumber: "updatePurePhoneNumber",
+        resetApplet: "resetApplet",
+        clearUserAuthen:"clearUserAuthen"
+      }),
+      //#ifdef MP-ALIPAY
+      getAliInfo(){
+        let userInfo = undefined
         my.getAuthCode({
-          scopes: ['auth_user',"auth_base","auth_zhima"],
+          // scopes: ['auth_user',"auth_base","auth_zhima"],
+          scopes: ['auth_user',"auth_base"],
          // 主动授权：auth_user，静默授权：auth_base。或者其它scope。如需同时获取用户多项授权，可在 scopes 中传入多个 scope 值。
-          success: (res) => {
+          success: async (res) => {
             console.log(res)
-          //   if (res.authCode) {
-          //     // 认证成功
-          //     // 调用自己的服务端接口，让服务端进行后端的授权认证，并且利用session，需要解决跨域问题
-          //     my.request({
-          //       url: 'https://isv.com/auth', // 该url是您自己的服务地址，实现的功能是服务端拿到authcode去开放平台进行token验证
-          //       data: {
-          //         authcode: res.authCode,
-          //       },
-          //       success: () => {
-          //         // 授权成功并且服务器端登录成功
-          //       },
-          //       fail: () => {
-          //         // 根据自己的业务场景来进行错误处理
-          //       },
-          //     });
-          //   }
+            if (res.authCode) {
+              // 认证成功
+              // 调用自己的服务端接口，让服务端进行后端的授权认证
+              const profileData = await this.$Request({
+                url: "/getAliUserInfo",
+                method: "GET",
+                data:{
+                  authCode:res.authCode
+                }
+              })
+              console.log(profileData)
+              userInfo = profileData.data
+              userInfo = {
+                nickName:userInfo.userId, // 先骗过auth认证
+                avatarUrl:userInfo.avatar
+                // gender:userInfo.gender
+              }
+              const userId = profileData.data.userId;
+              
+              this.updateUserInfo(userInfo)
+              this.updateUnionId(userId)
+              this.updateOpenId(userId)
+
+              const [redirectErr, redirectData] = await uni.redirectTo({
+                url: "/pages/authen/login"
+              })
+            }
           },
+          fail:(err)=>{
+            this.clearUserAuthen();
+            uni.showToast({
+              title: e.message,
+              icon:"error"
+            })
+          }
         });
-        
-      },
-      test(res) {
-        console.log("你好")
-        console.log(res)
       },
-      ...mapMutations({
-        updateUserInfo: "updateUserInfo",
-        clearUserInfo: "clearUserInfo"
-      }),
+      //#endif
+      //#ifdef MP-WEIXIN
       async getUserInfo(res) {
         let userInfo = undefined
-        //#ifdef MP-WEIXIN
         try {
           this.getUserInfoLoading = true;
           uni.showLoading({
@@ -152,26 +169,8 @@
           })
           this.clearUserInfo()
         }
-        //#endif
-        
-        
-        //#ifdef MP-ALIPAY
-        my.getOpenUserInfo({
-          fail: (res) => {},
-          success: (res) => {
-            let userInfo = JSON.parse(res.response).response // 以下方的报文格式解析两层 response0
-            console.log(userInfo);
-          },
-        });
-        //#endif
-        
-        // //#ifndef 
-        // uni.showToast({
-        //   title: '暂时只支持微信和支付宝小程序'
-        // })
-        // //#endif
       },
-
+      //#endif
     },
     onLoad() { //默认加载
     }

pages/authen/login.vue

@@ -1,7 +1,9 @@
 <template>
   <view class="container">
+    {{error}}
     <image src="../../static/icon/login.png" mode="scaleToFill" class="icon"></image>
     <view class="content">
+      <!--  #ifdef  MP-WEIXIN -->
       <button 
         open-type='getPhoneNumber' 
         @getphonenumber="getPhoneNumber"
@@ -10,6 +12,13 @@
       >
         授权登录
       </button>
+      <!--  #endif -->
+      
+      <!--  #ifdef  MP-ALIPAY -->
+      <button  open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+        授权登录
+      </button>
+      <!--  #endif -->
       <button type="default">手机登录</button>
       <text>登录即代表同意《隐私政策》和《用户服务协议》</text>
     </view>
@@ -21,11 +30,13 @@
     mapMutations
   } from "vuex";
 
+
   export default {
     data() {
       return {
         code: '',
-        getPhoneNumberLoading:false
+        getPhoneNumberLoading:false,
+        error:''
       }
     },
     async onShow() {
@@ -55,9 +66,6 @@
           })
           return 
       }
-      
-      // let [err, loginData] = await uni.login();
-      // this.code = loginData.code
     },
     methods: {
       ...mapMutations({
@@ -70,6 +78,49 @@
         resetApplet: "resetApplet",
         clearUserAuthen:"clearUserAuthen"
       }),
+      //#ifdef MP-ALIPAY
+      getPhoneNumber(){
+        this.getPhoneNumberLoading  = true;
+        uni.showLoading({
+          title: '获取中...',
+          mask: true
+        });
+        my.getPhoneNumber({
+            success:async (res) => {
+                let encryptedData = res.response;
+                const phoneStringData = await this.$Request({
+                  url: "/alipayEncryptUserPhone",
+                  method: "POST",
+                  data:JSON.parse(encryptedData)
+                })
+                console.log('phoneString',phoneStringData)
+                const phoneInfo = JSON.parse(phoneStringData.data)
+                const phone = phoneInfo.mobile
+                console.log(this.userInfo)
+                this.updateUserInfo({
+                  ...this.userInfo,
+                  nickName:phone,
+                })
+                this.updatePhoneNumber(phone)
+                console.log('userInfo',this.userInfo)
+                uni.hideLoading();
+                this.getPhoneNumberLoading  = false;
+                uni.navigateBack({
+                  delta:1
+                }) 
+            },
+            fail: (e) => {
+                uni.showToast({
+                  // title: '请重新授权',
+                  title: e.message,
+                  icon:"error"
+                })
+                uni.hideLoading();
+                this.getPhoneNumberLoading  = false;
+            },
+        });
+      },
+      //#endif
       //#ifdef MP-WEIXIN
       async getPhoneNumber(info) {
         this.getPhoneNumberLoading  = true;
@@ -80,6 +131,7 @@
         
         if (info.detail.errMsg === "getPhoneNumber:ok") {
           try {
+            // throw new Error("你好")
             // let loginDataArr = await uni.login();
             // this.code = loginDataArr[1].code
             const iv = info.detail.iv
@@ -144,14 +196,15 @@
             uni.hideLoading();
             uni.navigateBack({
               delta:1
-            })
-            
+            })            
             // console.log(redirectData)
           } catch (e) {
             this.getPhoneNumberLoading = false
             uni.hideLoading();
+            this.error = e.message;
             uni.showToast({
-              title: '请重新授权~',
+              // title: '请重新授权',
+              title: e.message,
               icon:"error"
             })
             let [err, loginData] = await uni.login();

pages/confirm/confirm - 副本.vue

@@ -0,0 +1,1063 @@
+<template>
+  <view class="confirm">
+    <view class="bg">
+    </view>
+    <view class="container">
+      <view class="station">
+        <image :src="orderInfo.stationPic" mode="scaleToFill"></image>
+        <view class="info">
+          <view class="name">
+            {{orderInfo.stationName}}
+          </view>
+          <view class="content">
+            <view>
+              <text>油枪号：</text><text>{{selectedGas.oilGunNo}}号</text>
+            </view>
+            <view>
+              <text>油品名：</text><text>{{selectedGas.oilName}}</text>
+            </view>
+            <view>
+              <text>油站价：</text><text>￥{{selectedGas.oilPrice}}/{{orderInfo.cardOilsType==4 ? "Kg" : "L"}}</text>
+            </view>
+            <view>
+              <text>优惠价：</text><text>￥{{orderInfo.discountPrice}}/{{orderInfo.cardOilsType==4 ? "Kg" : "L"}}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view>
+        <view>
+          <view class="icon price"></view>订单金额
+        </view>
+        <text class="price">￥{{orderInfo.receivableAmt}}</text>
+      </view>
+      <view>
+        <view>
+          <view class="icon oil"></view>加油升数
+        </view>
+        <text>{{orderInfo.oilLiters}}{{orderInfo.cardOilsType==4 ? "Kg" : "L"}}</text>
+      </view>
+      <view>
+        <view>
+          <view class="icon discount"></view>优惠金额
+        </view>
+        <text>￥{{payType === 1 ? (+orderInfo.discountAmt_dzk).toFixed(2):(+orderInfo.discountAmt).toFixed(2)}}</text>
+      </view>
+
+      <!--      
+      <view class="dispose coupon">
+        <view class="title">
+          <text>优惠券</text>
+          <text>立减10元</text>
+        </view>
+        <view class="tip">
+          <text class="icon"></text>
+          <text>优惠券和电子卡不可叠加</text>
+        </view>
+        <view class="extra">
+          有可用的优惠券 >>
+        </view>
+      </view> 
+      -->
+      <view class="dispose dzk" @click="selectPayType" v-if="orderInfo.oilsCardFlag == 1">
+        <view class="title">
+          <text>电子卡</text>
+          <text>电子卡支付更优惠</text>
+        </view>
+        <view class="tip">
+          <text class="icon"></text>
+          <text v-show="availableCredit">您的{{ cardTypeTranslate[orderInfo.cardOilsType]}}余额<text>{{' ' +  orderInfo.balance + ' '}}</text>元，可用来支付此订单</text>
+          <text v-show="!availableCredit">{{ cardTypeTranslate[orderInfo.cardOilsType] }}余额<text>{{' ' +  orderInfo.balance + ' '}}</text>元，<text>不足以</text>完成此笔订单</text>
+        </view>
+        <view class="extra icon" :class="[payType === 1 ? 'selected':'', availableCredit ? '':'forbid']"></view>
+      </view>
+      <!--  
+      <view>
+        <view>
+          <view class="icon vip"></view>油站会员
+        </view>
+        <text>立刻开通</text>
+      </view> 
+      -->
+    </view>
+    <view class="submit">
+      <view class="area">
+        <text class="type" v-if="orderInfo.oilsCardFlag == 0" @click="selectPayType">实付款</text>
+        <text class="type" v-show="orderInfo.oilsCardFlag == 1 && payType==2" @click="selectPayType">微信付款</text>
+        <text class="type" v-show="orderInfo.oilsCardFlag == 1 && payType==1" @click="selectPayType">电子卡付款</text>
+        <text class="icon" v-if="orderInfo.oilsCardFlag == 1 && availableCredit" @click="selectPayType"></text>
+        <text class="amount" v-show="payType==2">￥{{orderInfo.amt}}</text>
+        <text class="amount" v-show="payType==1">￥{{orderInfo.amt_dzk}}</text>
+        <button class="btn" @click="goPay" :loading="wxPayLoading" :disabled="wxPayLoading">
+          提交订单
+        </button>
+      </view>
+    </view>
+    <uni-popup ref="pay" class="pay" type="bottom" maskClick="false">
+      <view class="cont">
+        <view class="close" @click="backToSelectPayType">
+        </view>
+        <view class="amount">
+          <text>￥</text>
+          {{ payType==2 ? orderInfo.amt : orderInfo.amt_dzk}}
+        </view>
+        <view class="type" @click="selectPayType">
+          <text>付款方式</text>
+          <text> {{ payType==2  ? '微信支付' : '电子卡支付'}}</text>
+          <text></text>
+        </view>
+        <button type="default" class="pay" @click="creditPay" :loading="creditPayLoading">
+          立即付款
+        </button>
+      </view>
+    </uni-popup>
+   <uni-popup ref="selectPayType" class="selectPayType" type="bottom" maskClick="false">
+      <view class="cont">
+        <view class="close" @click="closeSelectPayType">
+        </view>
+        <view class="credit">
+          <view class="credit-con" @click="selectPayType(1)">
+            <text class="text">电子卡支付(剩余：{{ orderInfo.balance }})</text>
+            <text class="icon" :class="[payType === 1 ? 'selected':'', availableCredit ? '':'forbid']"></text>
+          </view>
+          <text class="tip">
+            {{tip}}
+          </text>
+        </view>
+        <view class="wx" @click="selectPayType(2)">
+          <text class="text">微信支付</text>
+          <text class="icon" :class="[payType === 2 ? 'selected':'']"></text>
+        </view>
+        <button type="default" :class="[payType !== '' ? 'available' : '']" @click="goPay"
+          :disabled="payType === '' ? true : false" :loading="wxPayLoading">
+          确认
+        </button>
+      </view>
+    </uni-popup>
+    <uni-popup ref="coupon" class="coupon" type="bottom" maskClick="false">
+      <view class="coupon-container">
+        <view class="close" @click="closeCoupon">
+        </view>
+        <view class="title">
+          优惠券
+        </view>
+        <scroll-view scroll-y="true" class="coupon-scroll">
+          <view class="item cash">
+            <view class="left">
+              <text class="amount">￥<text class="big">100</text></text>
+              <text>无门槛</text>
+            </view>
+            <view class="right">
+              <text class="title">立减劵</text>
+              <text class="scope">范围：限汽油</text>
+             <text class="valid">有效至 2021.03.01</text>
+              <text class="use"></text>
+            </view>
+          </view>
+          <view class="item discount">
+            <view class="left">
+              <text class="amount">￥<text class="big">100</text></text>
+              <text>无门槛</text>
+            </view>
+            <view class="right">
+              <text class="title">立减劵</text>
+              <text class="scope">范围：限汽油</text>
+             <text class="valid">有效至 2021.03.01</text>
+              <text class="use"></text>
+            </view>
+          </view>
+          <view class="item exchange">
+            <view class="left">
+              <text class="amount">￥<text class="big">100</text></text>
+              <text>无门槛</text>
+            </view>
+            <view class="right">
+              <text class="title">立减劵</text>
+              <text class="scope">范围：限汽油</text>
+             <text class="valid">有效至 2021.03.01</text>
+              <text class="use"></text>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </uni-popup>
+  </view>
+</template>
+
+<script>
+  import {
+    mapState,
+    mapMutations
+  } from "vuex";
+
+  export default {
+    data() {
+      return {
+        payType: 2, // 1电子卡 2微信
+        wxPayLoading: false,
+        creditPayLoading: false,
+        cardTypeTranslate:['','汽油卡','柴油卡','非油品卡','LNG','CNG']
+      };
+    },
+    computed: {
+      // ...mapState(["orderInfo", "selectedGas", "openId", "stationId"]),
+      // ...mapState({
+      //   orderInfo: state => state.order.orderInfo,
+      //   openId: state => state.user.openId,
+      //   stationId: state => state.station.stationId,
+      //   selectedGas: state => state.station.selectedGas,
+      // }),
+      availableCredit() {
+        if(this.orderInfo.oilsCardFlag == 0){
+          return false
+        }
+        if ((+this.orderInfo.balance) < (+this.orderInfo.amt_dzk)) {
+          return false
+        }
+        return true
+      },
+      creditFlag(){
+        return this.orderInfo.oilsCardFlag == '1' ? true : false
+      }
+    },
+    created() {
+      // console.log(this.orderInfo)
+      this.initPayType()
+    },
+    mounted() {
+      // this.$refs.pay.close();
+      // this.$refs.coupon.open();
+    },
+    methods: {
+      ...mapMutations(["clearLabelId","updateVoucherInfo"]),
+      initPayType(){
+        if(this.orderInfo.oilsCardFlag == 1 && this.availableCredit){
+          this.payType = 1
+        }
+      },
+      closeCoupon(){
+        this.$refs.coupon.close();
+      },
+      async creditPay() {
+        this.creditPayLoading = true;
+        if (this.payType === 2) {
+          this.wxPay()
+          return
+        }
+        uni.showLoading({
+          title: '支付中...',
+          mask: true
+        });
+        try {
+          const creditPayData = await this.$Request({
+            url: "/dzkPaySet",
+            data: {
+              "ordNo": this.orderInfo.ordNo
+            },
+          })
+          console.log(creditPayData)
+          if (creditPayData.retCode !== 0) {
+            throw new Error(creditPayData.message)
+          }
+          this.creditPayLoading = false;
+          uni.hideLoading();
+          this.updateVoucherInfo({
+            receivableAmt: this.orderInfo.receivableAmt,
+            amt:this.payType==2 ? this.orderInfo.amt : this.orderInfo.amt_dzk,
+            oilName:this.selectedGas.oilName
+          })
+          console.log('我要跳了~')
+          uni.redirectTo({
+            url: "/pages/succeed/succeed"
+          })
+        } catch (e) {
+          this.creditPayLoading = false;
+          uni.hideLoading();
+          this.showToastAndGoback(e.toString())
+        }
+      },
+      async wxPay() {
+        this.wxPayLoading = true;
+        uni.showLoading({
+          title: '拉取支付...',
+          mask: true
+        });
+        // try {
+          const JhPayData = await this.$Request({
+            // url: "/getJhPayInfo",
+            url:"/yunPay",
+            method: "POST",
+            data: {
+              "ordNo": this.orderInfo.ordNo,
+              "openId": this.openId,
+              "stationId": this.stationId,
+              "userType": "1"
+            },
+          })
+          console.log(JhPayData)
+          if (JhPayData.retCode !== 0) {
+            throw new Error("请求信息失败")
+          }
+          // if (JhPayData.data.code !== '0000') {
+          //   throw new Error(JhPayData.data.msg)
+          // }
+          console.log(JhPayData.data.result_code)
+          if (JhPayData.data.result_code !== '01') {
+            throw new Error(JhPayData.data.msg)
+          }
+          // // let timeStamp = JhPayData.data.respData.payTimeStamp;
+          // let timeStamp = JhPayData.data.respData.timeStamp;
+          // let nonceStr = JhPayData.data.respData.paynonceStr;
+          // // let payPackage = JhPayData.data.respData.payPackage;
+          // let payPackage = JhPayData.data.respData.package_str;
+          // let signType = JhPayData.data.signType;
+          // let paySign = JhPayData.data.respData.paySign;
+          
+          
+          // let timeStamp = JhPayData.data.respData.payTimeStamp;
+          let timeStamp = JhPayData.data.timeStamp;
+          let nonceStr = JhPayData.data.nonceStr;
+          // let payPackage = JhPayData.data.respData.payPackage;
+          let payPackage = JhPayData.data.package_str;
+          let signType = JhPayData.data.signType;
+          let paySign = JhPayData.data.paySign;
+          // 填写随行付的信息，启动支付
+          console.log({
+            'timeStamp': timeStamp,
+            'nonceStr': nonceStr,
+            'package': payPackage,
+            'signType': signType,
+            'paySign': paySign,
+          })
+          const [payErr, payData] = await uni.requestPayment({
+            'timeStamp': timeStamp,
+            'nonceStr': nonceStr,
+            'package': payPackage,
+            'signType': signType,
+            'paySign': paySign,
+          })
+          console.log('------------',payData)
+          if (!!payData && payData.errMsg === "requestPayment:ok") {
+            this.wxPayLoading = false;
+            this.clearLabelId();
+            uni.hideLoading();
+            console.log({
+              receivableAmt: this.orderInfo.receivableAmt,
+              amt:this.payType==2 ? this.orderInfo.amt : this.orderInfo.amt_dzk,
+              oilName:this.selectedGas.oilName
+            })
+            this.updateVoucherInfo({
+              receivableAmt: this.orderInfo.receivableAmt,
+              amt:this.payType==2 ? this.orderInfo.amt : this.orderInfo.amt_dzk,
+              oilName:this.selectedGas.oilName
+            })
+            console.log('我要跳了~')
+            uni.redirectTo({
+              url: "/pages/succeed/succeed"
+            })
+            return;
+          }
+          this.wxPayLoading = false;
+          uni.hideLoading();
+          if (payErr.errMsg === "requestPayment:fail cancel") {
+            this.showToastAndGoback("取消了支付")
+            return;
+          }
+          this.showToastAndGoback("支付失败")
+        // } catch (e) {
+        //   this.wxPayLoading = false;
+        //   uni.hideLoading();
+        //   this.showToastAndGoback(e.message)
+        // }
+      },
+      showToastAndGoback(title) {
+        uni.showToast({
+          title,
+          mask: true
+        })
+        setTimeout(() => {
+          uni.navigateBack({
+            delta: 1
+          })
+        }, 1500)
+      },
+
+      // selectPayType(type) {
+      //   if (!this.availableCredit && type == 1) {
+      //     return
+      //   }
+      //   if (type === this.payType) {
+      //     this.payType = ""
+      //     return
+      //   }
+      //   this.payType = type
+      // },
+      
+      selectPayType() {
+        if (!this.availableCredit) {
+          return
+        }
+        if (this.payType === 1) {
+          this.payType = 2
+          return
+        }
+        this.payType = 1
+      },
+      goPay() {
+        if (this.payType === 2) {
+          this.wxPay()
+          return
+        }
+        if (this.payType === 1) {
+          // this.$refs.selectPayType.close();
+          this.$refs.pay.open()
+        }
+      },
+      backToSelectPayType() {
+        this.$refs.pay.close()
+        // this.$refs.selectPayType.open();
+      },
+      // closeSelectPayType() {
+      //   this.$refs.selectPayType.close();
+      // }
+
+    }
+  }
+</script>
+
+<style lang="scss">
+  page {
+    width: 750rpx;
+    background: #F2F2F2;
+
+    .confirm {
+      .bg {
+        width: 750rpx;
+        height: 352rpx;
+        background: #0EA374;
+      }
+
+      .container {
+        width: 690rpx;
+        margin: 0 auto;
+        margin-top: -239rpx;
+
+        .station {
+          width: 690rpx;
+          height: 340rpx;
+          background: #FFFFFF;
+          border-radius: 14rpx;
+          box-sizing: border-box;
+          padding: 21rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+
+          image {
+            width: 200rpx;
+            height: 240rpx;
+          }
+
+          .info {
+
+            width: 400rpx;
+            height: 240rpx;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            align-items: flex-start;
+
+            .content {
+              height: 180rpx;
+              display: flex;
+              flex-direction: column;
+              justify-content: space-between;
+              font-size: 28rpx;
+              font-weight: 400;
+              color: #666666;
+              line-height: 40rpx;
+
+              view {
+                display: flex;
+                justify-content: space-between;
+
+                text:nth-child(1) {
+                  width: 200rpx;
+                  display: inline-block;
+                }
+              }
+            }
+
+            .name {
+              height: 45rpx;
+              font-size: 32rpx;
+              font-weight: 600;
+              color: #111111;
+              line-height: 45rpx;
+            }
+          }
+        }
+
+
+        >view:not(.station) {
+          width: 690rpx;
+          height: 110rpx;
+          background: #FFFFFF;
+          box-shadow: 0px 2rpx 6rpx 5rpx rgba(237, 237, 237, 0.5);
+          border-radius: 10rpx;
+          margin-top: 20rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          box-sizing: border-box;
+          padding: 20rpx;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #111111;
+          line-height: 40rpx;
+
+          >view {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+
+            .icon {
+              display: inline-block;
+              width: 35rpx;
+              height: 30rpx;
+              // border: 2rpx solid #666666;
+              margin-right: 14rpx;
+            }
+
+            .price {
+              background: url(../../static/icon/dingdan.2x.png) no-repeat 0px 0px;
+              background-size: 100% 100%;
+            }
+
+            .oil {
+              background: url(../../static/icon/sheng.2x.png) no-repeat 0px 0px;
+              background-size: 100% 100%;
+            }
+
+            .discount {
+              background: url(../../static/icon/youhuiquan-2.2x.png) no-repeat 0px 0px;
+              background-size: 100% 100%;
+            }
+
+            .vip {
+              background: url(../../static/icon/huiyuan-.2x.png) no-repeat 0px 0px;
+              background-size: 100% 100%;
+            }
+            
+          }
+
+          text.price {
+            color: #F3B235;
+            line-height: 33rpx;
+          }
+
+          text.vip {
+            font-size: 24rpx;
+            color: #A76825;
+            line-height: 33rpx;
+          }
+
+        }
+        view.dispose{
+          width: 690rpx;
+          height: 150rpx;
+          position: relative;
+          display: inline-block;
+          .title{
+            position: absolute;
+            top: 36rpx;
+            left: 20rpx;
+            
+            text:nth-child(1){
+              height: 40rpx;
+              font-size: 28rpx;
+              font-weight: 400;
+              color: #000000;
+              line-height: 40rpx;
+              margin-right: 20rpx;
+            }
+            text:nth-child(2){
+              height: 28rpx;
+              font-size: 20rpx;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #F0B849;
+              line-height: 28rpx;
+              box-sizing: border-box;
+              border: 1px solid #F0B849;
+            }
+          }
+          .tip{
+            position: absolute;
+            top: 90rpx;
+            left: 20rpx;
+            
+            .icon{
+              width: 22rpx;
+              height: 22rpx;
+              background: url(../../static/icon/tipicon1.png) no-repeat 0px 0px;
+              background-size: 100% 100%;
+            }
+            text:nth-child(2),
+            text:nth-child(3){
+              height: 28rpx;
+              font-size: 20rpx;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: rgba(0, 0, 0, 0.4);
+              line-height: 28rpx;
+              
+              text{
+                  font-size: 27rpx;
+                  font-weight: 800rpx;
+                  // color: #007AFF;
+                  color: #838383;
+              }
+            }
+          }
+        }
+        view.coupon{
+          .extra{
+            position: absolute;
+            right: 20rpx;
+            top: 54rpx;
+            height: 34rpx;
+            font-size: 24rpx;
+            color: #6D6D6D;
+            line-height: 34rpx;
+          }
+        }
+        view.dzk{
+          .extra{
+            position: absolute;
+            right: 20rpx;
+            top: 54rpx;
+            background: url(../../static/icon/select.png) no-repeat 0px 0px;
+            background-size: 100% 100%;
+            width: 40rpx;
+            height: 40rpx;  
+            margin-right: 20rpx;
+          }
+          
+          .selected {
+            background: url(../../static/icon/selected.png) no-repeat 0px 0px;
+            background-size: 100% 100%;
+          }
+          
+          .forbid {
+            background: url(../../static/icon/forbid.png) no-repeat 0px 0px;
+            background-size: 100% 100%;
+          }
+        }
+      }
+
+      .submit {
+        width: 750rpx;
+        height: 180rpx;
+
+        // background: #FFFFFF;
+        // margin-top: 30rpx;
+        .area {
+          width: 750rpx;
+          height: 150rpx;
+          background: #FFFFFF;
+          position: fixed;
+          bottom: 0;
+          left: 0;
+          right: 0;
+          display: flex;
+          justify-content: flex-end;
+          align-items: center;
+
+          >.type{
+            font-size: 28rpx;
+            font-weight: 400;
+            color: #111111;
+            line-height: 40rpx;
+          }
+          >.amount{
+            font-size: 30rpx;
+            font-weight: 600;
+            color: #f3b338;
+            line-height: 40rpx;
+          }
+          >.icon{
+            background: url(../../static/icon/1_b01_down.2x.png) no-repeat 0px 0px;
+            background-size: 100% 100%;
+            display: inline-block;
+            width: 13rpx;
+            height: 8rpx;
+            line-height: 40rpx;
+            margin-left: 10rpx;
+            margin-right: 15rpx;
+          }
+          // text:nth-child(2) {
+          //   font-size: 30rpx;
+          //   font-weight: 600;
+          //   color: #f3b338;
+          //   line-height: 40rpx;
+          // }
+
+          .btn {
+            margin-left: 20rpx;
+            margin-right: 30rpx;
+            background-color: #0ea374;
+            border-radius: 40rpx;
+            width: 250rpx;
+            height: 80rpx;
+            font-size: 28rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 500;
+            color: #FFFFFF;
+            line-height: 80rpx;
+            text-align: center;
+          }
+        }
+      }
+
+      uni-popup.pay {
+        .cont {
+          width: 750rpx;
+          height: 682rpx;
+          background: #FFFFFF;
+          border-radius: 30rpx 30rpx 0 0;
+          position: relative;
+
+          .close {
+            background: url(../../static/icon/left.png) no-repeat 0px 0px;
+            background-size: 100% 100%;
+            width: 18rpx;
+            height: 30rpx;
+            position: absolute;
+            top: 46rpx;
+            left: 34rpx;
+          }
+
+          .amount {
+            width: 100%;
+            height: 100rpx;
+            font-size: 80rpx;
+            font-weight: 400;
+            color: #000000;
+            position: absolute;
+            top: 112rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+
+            text {
+              font-size: 40rpx;
+            }
+          }
+
+          .type {
+            width: 100%;
+            height: 34rpx;
+            position: absolute;
+            top: 310rpx;
+
+            text:nth-child(1) {
+              height: 34rpx;
+              font-size: 24rpx;
+              font-weight: 400;
+              color: #aaaaaa;
+              line-height: 34rpx;
+              position: absolute;
+              left: 58rpx;
+            }
+
+            text:nth-child(2) {
+              height: 34rpx;
+              font-size: 24rpx;
+              font-weight: 500;
+              color: #000000;
+              line-height: 34rpx;
+              position: absolute;
+              right: 144rpx;
+            }
+
+            text:nth-child(3) {
+              background: url(../../static/icon/right.png) no-repeat 0px 0px;
+              background-size: 100% 100%;
+              display: inline-block;
+              width: 12rpx;
+              height: 22rpx;
+              position: absolute;
+              right: 66rpx;
+              top: 7rpx;
+            }
+          }
+
+          .pay {
+            width: 590rpx;
+            height: 76rpx;
+            background: linear-gradient(103deg, #12A273 0%, #25AA7E 100%);
+            border-radius: 38rpx;
+            font-size: 28rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #FFFFFF;
+            line-height: 76rpx;
+            letter-spacing: 1rpx;
+            position: absolute;
+            bottom: 114rpx;
+            left: 80rpx;
+          }
+        }
+      }
+
+      uni-popup.selectPayType {
+        .cont {
+          width: 750rpx;
+          // width: 100%;
+          height: 680rpx;
+          background: #FFFFFF;
+          border-radius: 30rpx 30rpx 0 0;
+          position: relative;
+          padding: 0 25rpx;
+          box-sizing: border-box;
+
+          .close {
+            width: 38rpx;
+            height: 38rpx;
+            position: absolute;
+            top: 24rpx;
+            left: 24rpx;
+            background: url(../../static/icon/6_d05_close.2x.png) no-repeat 0px 0px;
+            background-size: 100% 100%;
+          }
+
+          .credit {
+            position: absolute;
+            width: 700rpx;
+            top: 138rpx;
+            height: 130rpx;
+            box-sizing: border-box;
+            border-bottom: 2rpx solid #D8D8D8;
+            color: #000 solid #D8D8D8;
+            padding: 0 30rpx;
+
+            .credit-con {
+              height: 60rpx;
+              display: flex;
+              justify-content: space-between;
+
+              .text {
+                font-size: 28rpx;
+                height: 40rpx;
+                line-height: 60rpx;
+                font-weight: 600;
+              }
+
+              .icon {
+                background: url(../../static/icon/select.png) no-repeat 0px 0px;
+                background-size: 100% 100%;
+                width: 40rpx;
+                height: 40rpx;
+              }
+
+              .selected {
+                background: url(../../static/icon/selected.png) no-repeat 0px 0px;
+                background-size: 100% 100%;
+              }
+
+              .forbid {
+                background: url(../../static/icon/forbid.png) no-repeat 0px 0px;
+                background-size: 100% 100%;
+              }
+            }
+
+            .tip {
+              margin-top: 16rpx;
+              height: 44rpx;
+              font-size: 24rpx;
+              font-weight: 400;
+              color: rgba(0, 0, 0, 0.29);
+              line-height: 44rpx;
+            }
+          }
+
+          .wx {
+            position: absolute;
+            width: 700rpx;
+            top: 305rpx;
+            padding: 0 30rpx;
+            height: 40rpx;
+            display: flex;
+            box-sizing: border-box;
+            justify-content: space-between;
+
+            .text {
+              font-size: 28rpx;
+              height: 40rpx;
+              line-height: 40rpx;
+              font-weight: 600;
+            }
+
+            .icon {
+              background: url(../../static/icon/select.png) no-repeat 0px 0px;
+              background-size: 100% 100%;
+              width: 40rpx;
+              height: 40rpx;
+            }
+
+            .selected {
+              background: url(../../static/icon/selected.png) no-repeat 0px 0px;
+              background-size: 100% 100%;
+            }
+          }
+
+          >button {
+            width: 590rpx;
+            height: 76rpx;
+            background-color: #cccccc;
+            border-radius: 38rpx;
+            font-size: 28rpx;
+            font-weight: 400;
+            color: #FFFFFF;
+            line-height: 76rpx;
+            letter-spacing: 1rpx;
+            position: absolute;
+            box-sizing: border-box;
+            bottom: 114rpx;
+            left: 80rpx;
+          }
+
+          >button.available {
+            background: linear-gradient(103deg, #12A273 0%, #25AA7E 100%);
+          }
+        }
+      }
+
+      uni-popup.coupon {
+        .coupon-container {
+          width: 100%;
+          border-radius: 42rpx 42rpx 0px 0px;
+          background: #F2F2F2;
+          padding: 0 30rpx;
+          box-sizing: border-box;
+          position: relative;
+          
+          .close{
+            width: 38rpx;
+            height: 38rpx;
+            position: absolute;
+            top: 24rpx;
+            right: 24rpx;
+            background: url(../../static/icon/6_d05_close.2x.png) no-repeat 0px 0px;
+            background-size: 100% 100%;
+          }
+          
+          >.title {
+            height: 105rpx;
+            font-size: 32rpx;
+            font-weight: 400;
+            color: #111111;
+            line-height: 105rpx;
+            font-weight: 600;
+            color: #111111;
+            text-align: center;
+          }
+
+          .coupon-scroll {
+            max-height: 500rpx;
+            overflow: scroll;
+            
+            .item {
+              width: 690rpx;
+              height: 160rpx;
+              font-size: 24rpx;
+              font-weight: 500;
+              color: #FFFFFF;
+              line-height: 40rpx;
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 20rpx;
+
+              .left {
+                width: 150rpx;
+                height: 160rpx;
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
+                text-align: center;
+
+                .amount {
+                  font-size: 20rpx;
+
+                  .big {
+                    font-size: 33rpx;
+                  }
+                }
+              }
+
+              .right {
+                width: 540rpx;
+                height: 160rpx;
+                color: #111111;
+                position: relative;
+
+                .title {
+                  position: absolute;
+                  top: 22rpx;
+                  left: 20rpx;
+                  height: 40rpx;
+                  font-size: 28rpx;
+                  font-weight: 500;
+                  line-height: 40rpx;
+                }
+
+                .scope {
+                  position: absolute;
+                  top: 72rpx;
+                  left: 20rpx;
+                  height: 28rpx;
+                  font-size: 20rpx;
+                  color: #666666;
+                  line-height: 28rpx;
+                }
+
+                .valid {
+                  position: absolute;
+                  top: 110rpx;
+                  left: 20rpx;
+                  height: 28rpx;
+                  font-size: 20rpx;
+                  color: #666666;
+                  line-height: 28rpx;
+                }
+
+                .use {
+                  position: absolute;
+                  top: 54rpx;
+                  right: 20rpx;
+                  display: inline-block;
+                  width: 160rpx;
+                  height: 55rpx;
+                }
+              }
+            }
+
+            .cash{
+              background: url(../../static/icon/youhuiquan1.2x.png) no-repeat 0px 0px;
+              background-size: 100% 100%;
+            }
+            .discount{
+              background: url(../../static/icon/youhuiquan2.2x.png) no-repeat 0px 0px;
+              background-size: 100% 100%;
+            }
+            .exchange{
+              background: url(../../static/icon/youhuiquan3.2x.png) no-repeat 0px 0px;
+              background-size: 100% 100%;
+            }
+          }
+        }
+      }
+    }
+  }
+</style>

pages/confirm/confirm.vue

@@ -11,16 +11,16 @@
           </view>
           <view class="content">
             <view>
-              <text>油枪号：</text><text>{{selectedGas.oilGunNo}}号</text>
+              <text>枪 号：</text><text>{{selectedGas.oilGunNo}}号</text>
             </view>
             <view>
-              <text>油品名：</text><text>{{selectedGas.oilName}}</text>
+              <text>品 名：</text><text>{{selectedGas.oilName}}</text>
             </view>
             <view>
-              <text>油站价：</text><text>￥{{selectedGas.oilPrice}}/{{orderInfo.cardOilsType==4 ? "Kg" : "L"}}</text>
+              <text>枪标价：</text><text>￥{{selectedGas.oilPrice}}/{{orderInfo.cardOilsType==4 ? "Kg" : "L"}}</text>
             </view>
             <view>
-              <text>优惠价：</text><text>￥{{orderInfo.discountPrice}}/{{orderInfo.cardOilsType==4 ? "Kg" : "L"}}</text>
+              <text>优惠价：</text><text>￥{{discountPrice}}/{{orderInfo.cardOilsType==4 ? "Kg" : "L"}}</text>
             </view>
           </view>
         </view>
@@ -41,37 +41,51 @@
         <view>
           <view class="icon discount"></view>优惠金额
         </view>
-        <text>￥{{payType === 1 ? (+orderInfo.discountAmt_dzk).toFixed(2):(+orderInfo.discountAmt).toFixed(2)}}</text>
+        <text>￥{{discountAmt}}</text>
       </view>
 
-      <!--      
-      <view class="dispose coupon">
+      <!--  #ifdef  MP-WEIXIN -->
+      <view class="dispose coupon"
+        :class="[selectedCoupon.couponType=='1'?'direct':'', selectedCoupon.couponType=='2'?'rate':'']"
+        @click="goSelectCoupon" v-if="couponEnabledFlag=='1'">
+        <!--        <view class="coupon_bg">
+          你好
+        </view> -->
         <view class="title">
           <text>优惠券</text>
-          <text>立减10元</text>
+          <text v-if="!!selectedCoupon.id">{{creditNameplate}}</text>
         </view>
         <view class="tip">
           <text class="icon"></text>
-          <text>优惠券和电子卡不可叠加</text>
+          <text>{{couponTip}}</text>
         </view>
-        <view class="extra">
-          有可用的优惠券 >>
+        <view class="extra" :class="couponsList.length==0 ? 'disable':'' ">
+          {{couponMore}}
         </view>
-      </view> 
-      -->
+      </view>
+      <!--  #endif -->
+      <!--  #ifdef  MP-WEIXIN -->
       <view class="dispose dzk" @click="selectPayType" v-if="orderInfo.oilsCardFlag == 1">
         <view class="title">
           <text>电子卡</text>
-          <text>电子卡支付更优惠</text>
+          <text> {{availableCouponToCredit?"电子卡支付更优惠":"不可用"}}</text>
         </view>
         <view class="tip">
           <text class="icon"></text>
-          <text v-show="availableCredit">您的{{ cardTypeTranslate[orderInfo.cardOilsType]}}余额<text>{{' ' +  orderInfo.balance + ' '}}</text>元，可用来支付此订单</text>
-          <text v-show="!availableCredit">{{ cardTypeTranslate[orderInfo.cardOilsType] }}余额<text>{{' ' +  orderInfo.balance + ' '}}</text>元，<text>不足以</text>完成此笔订单</text>
+          <template v-if="availableCouponToCredit">
+            <text
+              v-show="availableCredit">您的{{ cardTypeTranslate[orderInfo.cardOilsType]}}余额<text>{{' ' +  orderInfo.balance + ' '}}</text>元，可用来支付此订单</text>
+            <text
+              v-show="!availableCredit">{{ cardTypeTranslate[orderInfo.cardOilsType] }}余额<text>{{' ' +  orderInfo.balance + ' '}}</text>元，<text>不足以</text>完成此笔订单</text>
+          </template>
+          <template v-else>
+            <text>您目前选中的优惠券不可使用电子卡</text>
+          </template>
         </view>
         <view class="extra icon" :class="[payType === 1 ? 'selected':'', availableCredit ? '':'forbid']"></view>
       </view>
-      <!--  
+      <!--  #endif -->
+      <!-- 
       <view>
         <view>
           <view class="icon vip"></view>油站会员
@@ -79,18 +93,28 @@
         <text>立刻开通</text>
       </view> 
       -->
+
     </view>
     <view class="submit">
       <view class="area">
+        <!--  #ifdef  MP-WEIXIN -->
         <text class="type" v-if="orderInfo.oilsCardFlag == 0" @click="selectPayType">实付款</text>
         <text class="type" v-show="orderInfo.oilsCardFlag == 1 && payType==2" @click="selectPayType">微信付款</text>
         <text class="type" v-show="orderInfo.oilsCardFlag == 1 && payType==1" @click="selectPayType">电子卡付款</text>
         <text class="icon" v-if="orderInfo.oilsCardFlag == 1 && availableCredit" @click="selectPayType"></text>
-        <text class="amount" v-show="payType==2">￥{{orderInfo.amt}}</text>
-        <text class="amount" v-show="payType==1">￥{{orderInfo.amt_dzk}}</text>
+        <text class="amount">￥{{amt}}</text>
         <button class="btn" @click="goPay" :loading="wxPayLoading" :disabled="wxPayLoading">
           提交订单
         </button>
+        <!--  #endif -->
+        <!--  #ifdef  MP-ALIPAY -->
+        <text class="type" @click="aliPay">实付款</text>
+        <text class="amount">￥{{amt}}</text>
+        <button class="btn" @click="aliPay" :loading="wxPayLoading" :disabled="wxPayLoading">
+          提交订单
+        </button>
+        <!--  #endif -->
+
       </view>
     </view>
     <uni-popup ref="pay" class="pay" type="bottom" maskClick="false">
@@ -99,7 +123,7 @@
         </view>
         <view class="amount">
           <text>￥</text>
-          {{ payType==2 ? orderInfo.amt : orderInfo.amt_dzk}}
+          {{ amt }}
         </view>
         <view class="type" @click="selectPayType">
           <text>付款方式</text>
@@ -111,7 +135,8 @@
         </button>
       </view>
     </uni-popup>
-<!--    <uni-popup ref="selectPayType" class="selectPayType" type="bottom" maskClick="false">
+    <!-- 
+    <uni-popup ref="selectPayType" class="selectPayType" type="bottom" maskClick="false">
       <view class="cont">
         <view class="close" @click="closeSelectPayType">
         </view>
@@ -133,7 +158,8 @@
           确认
         </button>
       </view>
-    </uni-popup> -->
+    </uni-popup>
+    -->
     <uni-popup ref="coupon" class="coupon" type="bottom" maskClick="false">
       <view class="coupon-container">
         <view class="close" @click="closeCoupon">
@@ -142,42 +168,67 @@
           优惠券
         </view>
         <scroll-view scroll-y="true" class="coupon-scroll">
-          <view class="item cash">
-            <view class="left">
-              <text class="amount">￥<text class="big">100</text></text>
-              <text>无门槛</text>
-            </view>
-            <view class="right">
-              <text class="title">立减劵</text>
-              <text class="scope">范围：限汽油</text>
-             <text class="valid">有效至 2021.03.01</text>
-              <text class="use"></text>
-            </view>
-          </view>
-          <view class="item discount">
-            <view class="left">
-              <text class="amount">￥<text class="big">100</text></text>
-              <text>无门槛</text>
-            </view>
-            <view class="right">
-              <text class="title">立减劵</text>
-              <text class="scope">范围：限汽油</text>
-             <text class="valid">有效至 2021.03.01</text>
-              <text class="use"></text>
-            </view>
-          </view>
-          <view class="item exchange">
-            <view class="left">
-              <text class="amount">￥<text class="big">100</text></text>
-              <text>无门槛</text>
+
+          <template v-for="ele in couponsList">
+            <view class="coupon" :class="[ele.couponType == 1 ? 'direct':'', ele.couponType == 2 ? 'rate':'' ]"
+              @click="selectCoupon(ele)">
+              <view class="left">
+                <view class="amount">
+                  {{ ele.couponType == 1 ? '￥':''}}{{ele.couponType == 2 ? '% ':''}}
+                  <text class="value">{{ ele.couponAmt }}</text>
+                </view>
+                <view class="condition">{{
+                  ele.couponThresholdAmt == 0
+                    ? "无门槛"
+                    : "满" + ele.couponThresholdAmt + "元可用"
+                }}</view>
+              </view>
+              <view class="right">
+                <view class="title">
+                  <text class="type">{{ele.couponType == 1 ? '立减劵':''}}{{ele.couponType == 2 ? '折扣劵':''}}</text>
+                </view>
+                <view class="content">
+                  <view class="items">
+                    <view class="item scope">适用：<text>{{
+                   (ele.oilName || []).toString()
+                  }}</text></view>
+                    <view class="item valid">截止：<text>{{ele.couponEffectiveTime}}</text></view>
+                  </view>
+                  <view class="btn">
+                    <!--  <button>已领</button> -->
+                    <view class="extra icon" :class="[selectedCoupon.id === ele.id ? 'selected':'']"></view>
+                  </view>
+                </view>
+                <!-- <view class="tip">凭借此劵可以减少支付的金额，欢迎来加油~</view> -->
+              </view>
             </view>
-            <view class="right">
-              <text class="title">立减劵</text>
-              <text class="scope">范围：限汽油</text>
-             <text class="valid">有效至 2021.03.01</text>
-              <text class="use"></text>
+          </template>
+          <!--    
+          <template v-for="ele in couponsList">
+            <view class="item cash" :class="[ele.couponType == 1 ? 'cash':'', ele.couponType == 2 ? 'discount':'' ]"
+              v-if="ele.couponType == 1 || ele.couponType == 2">
+              <view class="left">
+                <text class="amount">
+                  {{ ele.couponType == 1 ? '￥':''}}{{ele.couponType == 2 ? '% ':''}}
+                  <text class="big">{{ ele.couponAmt }}</text>
+                </text>
+                <text>{{
+                  ele.couponThresholdAmt == 0
+                    ? "无门槛"
+                    : "满" + ele.couponThresholdAmt + "元可用"
+                }}</text>
+              </view>
+              <view class="right">
+                <text class="title">{{ele.couponType == 1 ? '立减劵':''}}{{ele.couponType == 2 ? '折扣劵':''}}</text>
+                <text class="scope">范围：{{
+                   (ele.oilName || []).toString()
+                  }}</text>
+                <text class="valid">有效至 {{ele.couponEffectiveTime}}</text>
+                <text class="use"></text>
+              </view>
             </view>
-          </view>
+          </template>
+        -->
         </scroll-view>
       </view>
     </uni-popup>
@@ -196,47 +247,213 @@
         payType: 2, // 1电子卡 2微信
         wxPayLoading: false,
         creditPayLoading: false,
-        cardTypeTranslate:['','汽油卡','柴油卡','非油品卡','LNG','CNG']
+        cardTypeTranslate: ['', '汽油卡', '柴油卡', '非油品卡', 'LNG', 'CNG'],
+        selectedCoupon: {},
       };
     },
     computed: {
       // ...mapState(["orderInfo", "selectedGas", "openId", "stationId"]),
-      // ...mapState({
-      //   orderInfo: state => state.order.orderInfo,
-      //   openId: state => state.user.openId,
-      //   stationId: state => state.station.stationId,
-      //   selectedGas: state => state.station.selectedGas,
-      // }),
+      ...mapState({
+        couponEnabledFlag: state => state.coupon.couponEnabledFlag,
+        couponsList: state => state.coupon.couponList,
+
+        // orderInfo: state => state.order.orderInfo,
+        // openId: state => state.user.openId,
+        // stationId: state => state.station.stationId,
+        // selectedGas: state => state.station.selectedGas,
+      }),
       availableCredit() {
-        if(this.orderInfo.oilsCardFlag == 0){
+        if (this.orderInfo.oilsCardFlag == 0) {
           return false
         }
         if ((+this.orderInfo.balance) < (+this.orderInfo.amt_dzk)) {
           return false
         }
+        // 优惠劵
+        if (!this.availableCouponToCredit) {
+          return false
+        }
         return true
       },
-      creditFlag(){
+      availableCouponToCredit() { // 当前选择的优惠券是否可用电子卡
+        return !(this.couponEnabledFlag == 1 && this.selectedCoupon.isCardFlag == 0)
+      },
+      creditFlag() {
         return this.orderInfo.oilsCardFlag == '1' ? true : false
+      },
+      creditNameplate() {
+        if (!!this.selectedCoupon.id) {
+          let amt = +this.orderInfo.receivableAmt
+          let derate
+          if (this.selectedCoupon.couponType == '1') {
+            derate = +this.selectedCoupon.couponAmt
+            derate = derate.toFixed(2)
+            return '直降立减' + derate + "元"
+          } else if (this.selectedCoupon.couponType == '2') {
+            derate = (+amt) * (100 - (this.selectedCoupon.couponAmt)) / 100
+            derate = derate.toFixed(2)
+            return '折扣立减' + derate + "元"
+          }
+        } else {
+          return "关注公众号获取优惠券"
+        }
+      },
+      couponTip() {
+        if (!!this.selectedCoupon.id) {
+          if (this.selectedCoupon.couponType == '1') {
+            return "您已经使用面值为" + this.selectedCoupon.couponAmt + "元的直降优惠券"
+          } else if (this.selectedCoupon.couponType == '2') {
+            return "您已经使用折扣为" + this.selectedCoupon.couponAmt + "%的优惠券"
+          }
+        }
+        return "关注公众号获取更多优惠券"
+      },
+      couponMore() {
+        console.log(this.couponEnabledFlag)
+        if (this.couponEnabledFlag == '0') {
+          return '未开启优惠券'
+        }
+        if (!!this.selectedCoupon.id) {
+          return '重选优惠券 >>>'
+        }
+        if (this.couponsList.length == 0) {
+          return '暂无可用优惠劵 >>>'
+        }
+        return '有可用的优惠券 >>>'
+      },
+      discountPrice() {
+        if (!!this.selectedCoupon.id) {
+          if (this.payType == 2) {
+            return this.selectedCoupon.couponReckonAmt.discountPrice
+          } else if (this.payType == 1) {
+            return this.selectedCoupon.couponReckonAmt.dzkDiscountPrice
+          }
+        } else {
+          if (this.payType == 2) {
+            return this.orderInfo.discountPrice
+          } else if (this.payType == 1) {
+            return this.orderInfo.dzkDiscountPrice
+          }
+        }
+      },
+      discountAmt() {
+        let discountAmt
+        if (!!this.selectedCoupon.id) {
+          if (this.payType == 2) { // 微信
+            discountAmt = this.selectedCoupon.couponReckonAmt.discountAmt
+          } else if (this.payType == 1) {
+            discountAmt = this.selectedCoupon.couponReckonAmt.dzkDiscountAmt
+          }
+        } else {
+          if (this.payType == 2) { // 微信
+            discountAmt = this.orderInfo.discountAmt
+          } else if (this.payType == 1) {
+            discountAmt = this.orderInfo.discountAmt_dzk
+          }
+        }
+        return (+discountAmt).toFixed(2)
+      },
+      amt() {
+        if (!!this.selectedCoupon.id) {
+          if (this.payType == 2) {
+            return this.selectedCoupon.couponReckonAmt.amt
+          } else if (this.payType == 1) {
+            return this.selectedCoupon.couponReckonAmt.dzkAmt
+          }
+        } else {
+          if (this.payType == 2) {
+            return this.orderInfo.amt
+          } else if (this.payType == 1) {
+            return this.orderInfo.amt_dzk
+          }
+        }
       }
     },
     created() {
-      // console.log(this.orderInfo)
       this.initPayType()
     },
-    mounted() {
-      // this.$refs.pay.close()
-      // this.$refs.coupon.open();
-    },
+    mounted() {},
     methods: {
-      ...mapMutations(["clearLabelId"]),
-      initPayType(){
-        if(this.orderInfo.oilsCardFlag == 1 && this.availableCredit){
+      ...mapMutations(["clearLabelId", "updateVoucherInfo"]),
+      initPayType() {
+        if (this.orderInfo.oilsCardFlag == 1 && this.availableCredit) {
           this.payType = 1
         }
       },
-      closeCoupon(){
+      closeCoupon() {
+        this.$refs.coupon.close();
+      },
+      goSelectCoupon() {
+        if (this.couponsList.length == 0) {
+          return
+        }
+        this.$refs.coupon.open();
+      },
+      selectCoupon(ele) {
+        // 未开启优惠券功能
+        if (this.couponEnabledFlag == '0') {
+          return
+        }
+        // 取消选中
+        if (this.selectedCoupon.id == ele.id) {
+          this.selectedCoupon = {}
+          this.$refs.coupon.close();
+          return
+        }
+        // 选中
+        this.selectedCoupon = ele
+        if (!this.availableCouponToCredit) {
+          this.payType = 2
+        }
         this.$refs.coupon.close();
+        const index = this.couponsList.findIndex(item => ele.id == item.id)
+        setTimeout(() => {
+          this.couponsList.splice(0, 0, this.couponsList.splice(index, 1)[0])
+        }, 500)
+      },
+      async aliPay() {
+        this.wxPayLoading = true;
+        uni.showLoading({
+          title: '拉取支付...',
+          mask: true
+        });
+        try {
+          const aliPayData = await this.$Request({
+            url: "/aliPayAmtToSxf",
+            method: "POST",
+            data: {
+              "ordNo": this.orderInfo.ordNo,
+              "openId": this.openId,
+              "stationId": this.stationId,
+            },
+          })
+          const [payErr, payData] = await uni.requestPayment({
+            orderInfo: aliPayData.data.respData.source
+          })
+          console.log('支付', payErr, payData)
+          if (!!payData && payData.errMsg === "requestPayment:ok" && payData.resultCode == "9000") {
+            // this.wxPayLoading = false;
+            uni.hideLoading();
+            this.updateVoucherInfo({
+              receivableAmt: this.orderInfo.receivableAmt,
+              amt: this.amt,
+              oilName: this.selectedGas.oilName
+            })
+            this.wxPayLoading = false;
+            this.clearLabelId();
+            uni.hideLoading();
+            uni.redirectTo({
+              url: "/pages/succeed/succeed"
+            })
+            return;
+          }
+          throw new Error(payData.memo);
+
+        } catch (e) {
+          this.wxPayLoading = false;
+          uni.hideLoading();
+          this.showToastAndGoback(e.message)
+        }
       },
       async creditPay() {
         this.creditPayLoading = true;
@@ -252,7 +469,8 @@
           const creditPayData = await this.$Request({
             url: "/dzkPaySet",
             data: {
-              "ordNo": this.orderInfo.ordNo
+              "ordNo": this.orderInfo.ordNo,
+              "id": this.selectedCoupon.id // 优惠券的id
             },
           })
           console.log(creditPayData)
@@ -261,6 +479,12 @@
           }
           this.creditPayLoading = false;
           uni.hideLoading();
+          this.updateVoucherInfo({
+            receivableAmt: this.orderInfo.receivableAmt,
+            amt: this.amt,
+            oilName: this.selectedGas.oilName
+          })
+          console.log('我要跳了~')
           uni.redirectTo({
             url: "/pages/succeed/succeed"
           })
@@ -284,7 +508,8 @@
               "ordNo": this.orderInfo.ordNo,
               "openId": this.openId,
               "stationId": this.stationId,
-              "userType": "1"
+              "userType": "1",
+              "id": this.selectedCoupon.id // 优惠劵id
             },
           })
           console.log(JhPayData)
@@ -313,6 +538,17 @@
             this.wxPayLoading = false;
             this.clearLabelId();
             uni.hideLoading();
+            // console.log({
+            //   receivableAmt: this.orderInfo.receivableAmt,
+            //   amt: this.payType == 2 ? this.orderInfo.amt : this.orderInfo.amt_dzk,
+            //   oilName: this.selectedGas.oilName
+            // })
+            this.updateVoucherInfo({
+              receivableAmt: this.orderInfo.receivableAmt,
+              amt: this.amt,
+              oilName: this.selectedGas.oilName
+            })
+            console.log('我要跳了~')
             uni.redirectTo({
               url: "/pages/succeed/succeed"
             })
@@ -353,7 +589,7 @@
       //   }
       //   this.payType = type
       // },
-      
+
       selectPayType() {
         if (!this.availableCredit) {
           return
@@ -364,6 +600,15 @@
         }
         this.payType = 1
       },
+      creditAndCouponConflics(trigger, coupon) { // 处理电子卡和优惠券的互斥矛盾
+        //trigger 触发的事件
+        // trigger 1电子卡触发 2优惠券触发
+        // coupon 当trigger为2时需要传选中的优惠券
+        if (trigger == 1) {
+          this.selectedCoupon
+
+        }
+      },
       goPay() {
         if (this.payType === 2) {
           this.wxPay()
@@ -509,7 +754,7 @@
               background: url(../../static/icon/huiyuan-.2x.png) no-repeat 0px 0px;
               background-size: 100% 100%;
             }
-            
+
           }
 
           text.price {
@@ -524,25 +769,33 @@
           }
 
         }
-        view.dispose{
+
+        view.dispose {
           width: 690rpx;
           height: 150rpx;
           position: relative;
           display: inline-block;
-          .title{
+
+          .coupon_bg {
+            display: none;
+          }
+
+          .title {
             position: absolute;
             top: 36rpx;
             left: 20rpx;
-            
-            text:nth-child(1){
+
+            text:nth-child(1) {
               height: 40rpx;
               font-size: 28rpx;
               font-weight: 400;
               color: #000000;
               line-height: 40rpx;
               margin-right: 20rpx;
+              margin-left: 5rpx;
             }
-            text:nth-child(2){
+
+            text:nth-child(2) {
               height: 28rpx;
               font-size: 20rpx;
               font-family: PingFangSC-Regular, PingFang SC;
@@ -553,63 +806,109 @@
               border: 1px solid #F0B849;
             }
           }
-          .tip{
+
+          .tip {
             position: absolute;
             top: 90rpx;
             left: 20rpx;
-            
-            .icon{
+
+            .icon {
               width: 22rpx;
               height: 22rpx;
               background: url(../../static/icon/tipicon1.png) no-repeat 0px 0px;
               background-size: 100% 100%;
             }
+
             text:nth-child(2),
-            text:nth-child(3){
+            text:nth-child(3) {
               height: 28rpx;
               font-size: 20rpx;
               font-family: PingFangSC-Regular, PingFang SC;
               font-weight: 400;
               color: rgba(0, 0, 0, 0.4);
               line-height: 28rpx;
-              
-              text{
-                  font-size: 27rpx;
-                  font-weight: 800rpx;
-                  // color: #007AFF;
-                  color: #838383;
+
+              text {
+                font-size: 27rpx;
+                font-weight: 800rpx;
+                // color: #007AFF;
+                color: #838383;
               }
             }
           }
         }
-        view.coupon{
-          .extra{
+
+        view.coupon {
+          .extra {
             position: absolute;
-            right: 20rpx;
-            top: 54rpx;
-            height: 34rpx;
+            right: 0rpx;
+            top: 0rpx;
+            height: 150rpx;
+            width: 250rpx;
             font-size: 24rpx;
             color: #6D6D6D;
-            line-height: 34rpx;
+            line-height: 150rpx;
+            color: #249bdd;
+            font-weight: bold;
+            text-align: center;
+          }
+
+          .disable {
+            color: #6D6D6D;
+          }
+        }
+
+        view.coupon.direct {
+          background: url("../../static/icon/quan1.2x.png") no-repeat;
+          background-size: 100% 100%;
+
+          >.title {
+            text:nth-child(2) {
+              color: #FF2;
+            }
           }
         }
-        view.dzk{
-          .extra{
+
+        view.coupon.rate {
+          background: url("../../static/icon/quan2.2x.png") no-repeat;
+          background-size: 100% 100%;
+
+          >.title {
+            text:nth-child(2) {
+              color: #FD2;
+            }
+          }
+        }
+
+        // view.coupon.direct{
+        //   .coupon_bg{
+        //     display: block;
+        //   }
+        //   .title,
+        //   .tip{
+        //     left: 300rpx;
+        //   }
+        //   .extra{
+        //     display: none;
+        //   }
+        // }
+        view.dzk {
+          .extra {
             position: absolute;
             right: 20rpx;
             top: 54rpx;
             background: url(../../static/icon/select.png) no-repeat 0px 0px;
             background-size: 100% 100%;
             width: 40rpx;
-            height: 40rpx;  
+            height: 40rpx;
             margin-right: 20rpx;
           }
-          
+
           .selected {
             background: url(../../static/icon/selected.png) no-repeat 0px 0px;
             background-size: 100% 100%;
           }
-          
+
           .forbid {
             background: url(../../static/icon/forbid.png) no-repeat 0px 0px;
             background-size: 100% 100%;
@@ -635,19 +934,21 @@
           justify-content: flex-end;
           align-items: center;
 
-          >.type{
+          >.type {
             font-size: 28rpx;
             font-weight: 400;
             color: #111111;
             line-height: 40rpx;
           }
-          >.amount{
+
+          >.amount {
             font-size: 30rpx;
             font-weight: 600;
             color: #f3b338;
             line-height: 40rpx;
           }
-          >.icon{
+
+          >.icon {
             background: url(../../static/icon/1_b01_down.2x.png) no-repeat 0px 0px;
             background-size: 100% 100%;
             display: inline-block;
@@ -657,6 +958,7 @@
             margin-left: 10rpx;
             margin-right: 15rpx;
           }
+
           // text:nth-child(2) {
           //   font-size: 30rpx;
           //   font-weight: 600;
@@ -903,8 +1205,8 @@
           padding: 0 30rpx;
           box-sizing: border-box;
           position: relative;
-          
-          .close{
+
+          .close {
             width: 38rpx;
             height: 38rpx;
             position: absolute;
@@ -913,7 +1215,7 @@
             background: url(../../static/icon/6_d05_close.2x.png) no-repeat 0px 0px;
             background-size: 100% 100%;
           }
-          
+
           >.title {
             height: 105rpx;
             font-size: 32rpx;
@@ -926,93 +1228,284 @@
           }
 
           .coupon-scroll {
-            max-height: 500rpx;
+            max-height: 600rpx;
             overflow: scroll;
-            
-            .item {
-              width: 690rpx;
-              height: 160rpx;
-              font-size: 24rpx;
-              font-weight: 500;
-              color: #FFFFFF;
-              line-height: 40rpx;
+
+            .coupon {
               display: flex;
               justify-content: space-between;
-              margin-bottom: 20rpx;
+              width: 690rpx;
+              height: 160rpx;
+              margin-bottom: 50rpx;
+              box-shadow: 0 0 10rpx 4rpx rgba(233, 223, 223, 0.5);
 
-              .left {
-                width: 150rpx;
-                height: 160rpx;
+              >.left {
                 display: flex;
                 flex-direction: column;
                 justify-content: center;
                 text-align: center;
+                width: 220rpx;
+                height: 160rpx;
+                text-align: center;
 
                 .amount {
-                  font-size: 20rpx;
+                  display: block;
+                  font-size: 40rpx;
+                  font-weight: 500;
+                  color: #ffffff;
+                  line-height: 56rpx;
+                  text-align: center;
+                  margin-top: 0;
 
-                  .big {
-                    font-size: 33rpx;
+                  .value {
+                    font-size: 50rpx;
                   }
                 }
+
+                .condition {
+                  font-size: 24rpx;
+                  font-weight: 400;
+                  color: #ffffff;
+                  line-height: 33rpx;
+                  text-align: center;
+                  margin-top: 25rpx;
+                }
+
+                .exchangeName {
+                  display: none;
+                  font-size: 35rpx;
+                  font-weight: 500;
+                  color: #ffffff;
+                  line-height: 56rpx;
+                }
               }
 
-              .right {
-                width: 540rpx;
+              >.right {
+                width: 456rpx;
                 height: 160rpx;
-                color: #111111;
-                position: relative;
+                display: flex;
+                flex-direction: column;
+                justify-content: space-between;
+                margin: 8rpx 0 5rpx 0;
 
                 .title {
-                  position: absolute;
-                  top: 22rpx;
-                  left: 20rpx;
-                  height: 40rpx;
-                  font-size: 28rpx;
-                  font-weight: 500;
-                  line-height: 40rpx;
+                  height: 30rpx;
+                  font-size: 24rpx;
+                  font-weight: 600;
+                  line-height: 33rpx;
+
+                  .type {
+                    width: 113rpx;
+                    height: 30rpx;
+                    line-height: 30rpx;
+                    display: inline-block;
+                    background: #f8c;
+                    border-radius: 19rpx;
+                    font-size: 24rpx;
+                    font-weight: 600;
+                    color: #ffffff;
+                    text-align: center;
+                  }
                 }
 
-                .scope {
-                  position: absolute;
-                  top: 72rpx;
-                  left: 20rpx;
-                  height: 28rpx;
-                  font-size: 20rpx;
-                  color: #666666;
-                  line-height: 28rpx;
+                .content {
+                  display: flex;
+                  justify-content: space-between;
+                  margin: 5rpx 0 5rpx 0;
+                  height: 120rpx;
+
+                  >.items {
+                    width: 360rpx;
+                    height: 100%;
+                    display: flex;
+                    justify-content: space-around;
+                    flex-direction: column;
+
+                    .item {
+                      color: #272626;
+                      font-size: 21rpx;
+
+                      >text {
+                        width: 230rpx;
+                        display: inline-block;
+                        color: #272626;
+                        font-size: 22rpx;
+                        font-weight: bold;
+                        overflow: scroll;
+                        /* 超出部分隐藏 */
+                        white-space: nowrap;
+                        /* 文本不换行 */
+                      }
+                    }
+
+                    .from {
+                      display: block;
+                    }
+                  }
+
+                  >.btn {
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: center;
+                    margin-right: 10rpx;
+                    width: 70rpx;
+
+                    .extra {
+
+                      background: url(../../static/icon/select.png) no-repeat 0px 0px;
+                      background-size: 100% 100%;
+                      width: 55rpx;
+                      height: 55rpx;
+                      margin-right: 20rpx;
+                      margin-top: -10rpx;
+                    }
+
+                    .selected {
+                      background: url(../../static/icon/selected.png) no-repeat 0px 0px;
+                      background-size: 100% 100%;
+                    }
+
+                    // >button {
+                    //   height: 60rpx;
+                    //   background: linear-gradient(143deg, #fad965 0%, #f3b235 100%);
+                    //   border-radius: 20rpx;
+                    //   border: none;
+                    //   outline: none;
+                    //   color: #ffffff;
+                    //   line-height: 60rpx;
+                    //   font-size: 30rpx;
+                    //   font-weight: 400;
+                    //   overflow: hidden;
+                    //   /* 超出部分隐藏 */
+                    //   white-space: nowrap;
+                    //   /* 文本不换行 */
+                    //   display: block;
+                    // }
+                  }
                 }
+              }
+            }
+
+            .direct {
+              >.left {
+                background: url("../../static/icon/quan1.2x.png") no-repeat;
+                background-size: 100% 100%;
+              }
 
-                .valid {
-                  position: absolute;
-                  top: 110rpx;
-                  left: 20rpx;
-                  height: 28rpx;
-                  font-size: 20rpx;
-                  color: #666666;
-                  line-height: 28rpx;
+              >.right {
+                >.title>.type {
+                  background: #f8ce57;
                 }
 
-                .use {
-                  position: absolute;
-                  top: 54rpx;
-                  right: 20rpx;
-                  display: inline-block;
-                  width: 160rpx;
-                  height: 55rpx;
+                >.content>.btn button {
+                  background: linear-gradient(143deg, #fad965 0%, #f3b235 100%);
                 }
               }
             }
 
-            .cash{
+            .rate {
+              >.left {
+                background: url("../../static/icon/quan2.2x.png") no-repeat;
+                background-size: 100% 100%;
+              }
+
+              >.right {
+                >.title>.type {
+                  background: #eb8573;
+                }
+
+                >.content>.btn button {
+                  background: linear-gradient(143deg, #f4a796 0%, #e67462 100%);
+                }
+              }
+            }
+
+            // >.item {
+            //   width: 690rpx;
+            //   height: 160rpx;
+            //   font-size: 24rpx;
+            //   font-weight: 500;
+            //   color: #FFFFFF;
+            //   line-height: 40rpx;
+            //   display: flex;
+            //   justify-content: space-between;
+            //   margin-bottom: 20rpx;
+
+            //   .left {
+            //     width: 150rpx;
+            //     height: 160rpx;
+            //     display: flex;
+            //     flex-direction: column;
+            //     justify-content: center;
+            //     text-align: center;
+
+            //     .amount {
+            //       font-size: 20rpx;
+
+            //       .big {
+            //         font-size: 33rpx;
+            //       }
+            //     }
+            //   }
+
+            //   .right {
+            //     width: 540rpx;
+            //     height: 160rpx;
+            //     color: #111111;
+            //     position: relative;
+
+            //     .title {
+            //       position: absolute;
+            //       top: 22rpx;
+            //       left: 20rpx;
+            //       height: 40rpx;
+            //       font-size: 28rpx;
+            //       font-weight: 500;
+            //       line-height: 40rpx;
+            //     }
+
+            //     .scope {
+            //       position: absolute;
+            //       top: 72rpx;
+            //       left: 20rpx;
+            //       height: 28rpx;
+            //       font-size: 20rpx;
+            //       color: #666666;
+            //       line-height: 28rpx;
+            //     }
+
+            //     .valid {
+            //       position: absolute;
+            //       top: 110rpx;
+            //       left: 20rpx;
+            //       height: 28rpx;
+            //       font-size: 20rpx;
+            //       color: #666666;
+            //       line-height: 28rpx;
+            //     }
+
+            //     .use {
+            //       position: absolute;
+            //       top: 54rpx;
+            //       right: 20rpx;
+            //       display: inline-block;
+            //       width: 160rpx;
+            //       height: 55rpx;
+            //     }
+            //   }
+            // }
+
+            .cash {
               background: url(../../static/icon/youhuiquan1.2x.png) no-repeat 0px 0px;
               background-size: 100% 100%;
             }
-            .discount{
+
+            .exchange {
               background: url(../../static/icon/youhuiquan2.2x.png) no-repeat 0px 0px;
               background-size: 100% 100%;
             }
-            .exchange{
+
+            .discount {
               background: url(../../static/icon/youhuiquan3.2x.png) no-repeat 0px 0px;
               background-size: 100% 100%;
             }

pages/index/index.vue

@@ -9,9 +9,9 @@
     <view class="box">
       <view class="title">
         <view class="left">
-          选择油枪 |
-          <text v-if="!selectedGas.oilGunNo">请选择油枪</text>
-          <text class="selected" v-else>已选择{{selectedGas.oilGunNo}}号油枪</text>
+          选择枪号 |
+          <text v-if="!selectedGas.oilGunNo">请选择枪</text>
+          <text class="selected" v-else>已选择{{selectedGas.oilGunNo}}号枪</text>
         </view>
         <!-- <text class="right" @click="openMoreGun">更多 ></text> -->
       </view>
@@ -23,7 +23,7 @@
         <view v-for="item in cutGasList" @click="selectGas(item)"
           :class="[item.oilGunId === selectedGas.oilGunId ? 'selected' : '', cutGasList.length === 2 || cutGasList.length ===4 ? 'lengthIs2Or4' : '',cutGasList.length ===1 ? 'lengthIs1' : '' ]"
           :key="item.oilGunId">
-          <text>{{ item.oilGunNo + "号油枪"}}</text>
+          <text>{{ item.oilGunNo + "号枪"}}</text>
           <text>{{item.oilName}}</text>
         </view>
         <view @click="openMoreGun" :class="[showMoreGasSelected? 'selected':'']" v-if="gasList.length > 6">
@@ -63,14 +63,14 @@
     <uni-popup ref="popup" type="bottom" :maskClick="true">
       <view class="more-gun">
         <view class="title">
-          <text>选择油枪号</text>
+          <text>选择枪号</text>
           <view class="icon" @click="closeMoreGun"></view>
         </view>
         <view class="gun-list">
           <scroll-view scroll-y="true">
             <view v-for="item in gasList" @click="selectGasPopup(item)"
               :class="[item.oilGunId === selectedGas.oilGunId ? 'selected' : '']" :key="item.oilGunId">
-              <text>{{ item.oilGunNo + "号油枪"}}</text>
+              <text>{{ item.oilGunNo + "号枪"}}</text>
               <text>{{item.oilName}}</text>
             </view>
           </scroll-view>
@@ -131,7 +131,7 @@
       }
     },
     methods: {
-      ...mapMutations(["updateOrderInfo", "updateSelectedGas", "resetApplet"]),
+      ...mapMutations(["updateCouponEnabledFlag","updateSucceedIssueId","updateCouponList","updateOrderInfo", "updateSelectedGas", "resetApplet"]),
       async init() {
         // 准入条件
         if (!this.stationId) {
@@ -172,7 +172,8 @@
             uni.hideLoading()
             const parse = Parse.getInstance()
             parse.scanCode(true,{
-              showCancel: true,
+              showCancel: false,
+              // showCancel: true,
               content:'此站点只能扫码进入~',
             }).then(()=>{
               this.init()
@@ -248,11 +249,15 @@
       selectAccount(ele) {
         this.account = ele
       },
+      async creatAliOrder(){
+        
+      },
       async creatOrder() {
         if (!getPermission()) {
           return
         }
-
+        
+        
         this.loading = true
         uni.showLoading({
           title: '订单创建中...',
@@ -260,6 +265,7 @@
         });
 
         try {
+          //#ifdef MP-WEIXIN
           const addNewOrderPro = await this.$Request({
             url: "/AddPayOrderInfoNew",
             method: "POST",
@@ -274,7 +280,24 @@
               "personnelId": this.employeeId,
             }
           })
-
+          //#endif
+          //#ifdef MP-ALIPAY
+          const addNewOrderPro = await this.$Request({
+            url: "/AddPayOrderFromAliPay",
+            method: "POST",
+            data: {
+              "openId": this.openId,
+              "stationId": this.stationId,
+              "receivableAmt": this.account,
+              "oilName": this.selectedGas.oilName,
+              "oilGun": this.selectedGas.oilGunNo,
+              "labelId": this.labelId,
+              "personnelId": this.employeeId,
+              "customerName":this.userInfo.nickName,
+            }
+          })
+          console.log('aLiAddNewOrderPro',addNewOrderPro)
+          //#endif
           if (addNewOrderPro.retCode != 0) {
             throw new Error("创建失败~")
             return
@@ -282,7 +305,12 @@
           this.loading = false
           uni.hideLoading();
           this.updateOrderInfo(addNewOrderPro.data)
-
+          console.log('订单信息',addNewOrderPro)
+          //#ifdef MP-WEIXIN
+          this.updateCouponEnabledFlag(addNewOrderPro.data.couponEnabledFlag)
+          this.updateSucceedIssueId(addNewOrderPro.data.couponIssueId)
+          this.updateCouponList(addNewOrderPro.data.userCouponsList)
+          //#endif
           uni.navigateTo({
             url: "/pages/confirm/confirm"
           })

pages/list/list.vue

@@ -2,7 +2,7 @@
 
   <view class="list">
     
-    <view class="search">
+    <view class="search" v-if="showFrame">
       <div class="dist_search">
         <picker @change="bindPickerChange" :value="cityIndex" :range="cityArr">
             <view class="district">{{cityArr[cityIndex]}}</view>
@@ -20,7 +20,7 @@
       </view>
     </view>
     
-    <view class="postion">
+    <view class="postion" v-if="showFrame">
       <view class="icon"></view>
       <view class="current" @click="reGetLocation">
         当前位置：{{location}}
@@ -29,10 +29,15 @@
       </view>
     </view> 
    
-
+    <view class="distance" 
+      style="margin-top: 200rpx;text-align: center;"
+      v-if="moreDistanceTipShow"
+    >
+      您附近{{distanceShow}}公里内没有油站
+    </view>
     <view class="collection">
       <view class="station" 
-        v-for="ele in filterCityArr"
+        v-for="ele in filterDistanceArr"
         @click="goBuy($event, ele.stationId)"
       >
         <view class="content">
@@ -40,13 +45,13 @@
           <view class="detail">
             <view class="name">{{ ele.stationName }}</view>
             <view class="other">
-              <text v-show="ele.distance!==undefined">{{ele.distance + ' '}}km | </text> 
+              <text v-if="ele.distance!==undefined">{{ele.distance + ' '}}km | </text> 
               {{ ' ' + ele.stationAddress }}
             </view>
           </view>
         </view>
         <view class="footer">
-          <view class="gothere" @click.stop="goThere($event, ele.stationLatitude, ele.stationLongitude)">
+          <view class="gothere" @click.stop="goThere($event, ele.stationLatitude, ele.stationLongitude, ele.stationName, ele.stationAddress)">
             去这里
           </view>
           <view class="separator">|</view>
@@ -66,6 +71,7 @@
     mapGetters
   } from "vuex";
   import Parse from "../../util/parse.js"
+  import settings from '@/settings.js'
 
   // import getPermission from "../../util/permission.js"
   export default {
@@ -77,7 +83,10 @@
         res: {},
         // cityArr:['泰安市','济南市'],
         cityIndex:0,
-        location:'正在拼命拉取中...'
+        location:'正在拼命拉取中...',
+        showFrame:false,
+        showDistanceEmptyListTip:false,
+        distanceShow:settings.distanceShow
       }
     },
     async created() {
@@ -85,10 +94,13 @@
       // wx.setEnableDebug({
       //   enableDebug: true
       // })
-
+      this.initAli()
       this.init()
     },
     computed: {
+      moreDistanceTipShow(){
+        return settings.distanceFlag && settings.distanceShow!=0 && this.filterDistanceArr.length == 0 && this.showDistanceEmptyListTip
+      },
       filterCityArr(){        
         return this.stationList.filter((ele)=>{
           if(this.cityArr[this.cityIndex] == '全部'){
@@ -103,6 +115,16 @@
           cityArrSet.add(ele.city)
         })
         return [...cityArrSet]
+      },
+      filterDistanceArr(){
+        if(settings.distanceFlag){
+          if(settings.distanceShow!=0){
+            return this.filterCityArr.filter((ele)=>{
+              return ele.distance <= settings.distanceShow
+            })
+          }
+        }
+        return this.filterCityArr
       }
     },
     methods: {
@@ -110,6 +132,12 @@
       test() {
         console.log(132)
       },
+      initAli(){
+        // #ifdef  MP-ALIPAY
+        settings.distanceFlag = true;
+        settings.distanceShow = settings.aLiDistanceShow;
+        // #endif
+      },
       async init() {
         uni.showLoading({
           title: '加载中...',
@@ -119,6 +147,7 @@
         const oldLocation = this.location
         try{
           this.location = '正在拼命拉取中...'
+          //#ifdef MP-WEIXIN
           const stationListData = await this.$Request({
             url: "/getStationListByAppId",
             method: "GET",
@@ -126,6 +155,16 @@
               appId: this.appId
             }
           })
+          //#endif
+          //#ifdef MP-ALIPAY
+          const stationListData = await this.$Request({
+            url: "/getStationListToAliPay",
+            method: "GET",
+            data: {
+              // appId: this.appId
+            }
+          })
+          //#endif
           if(stationListData.retCode !== 0){
             throw new Error("初始油站信息失败")
           }
@@ -137,29 +176,41 @@
             })
             return
           }
-          this.stationList = stationListData.data;
+          
+          if(settings.distanceFlag && settings.distanceShow==0){
+            this.stationList = []
+          }else{
+            this.stationList = stationListData.data;
+            this.showFrame = true;
+          }
+          
+          
           const locationData = await uni.getLocation()
           if(locationData[0] !== null && locationData[0].errMsg === 'getLocation:fail auth deny' ){
             // 用户拒绝位置
-            this.location = "您拒绝了授权~"
+            this.location = "您拒绝了授权，点击重新获取~"
+            this.showFrame = true;
             uni.hideLoading();
             return
           }else if(locationData[0] !== null && locationData[0].errMsg === 'getLocation:fail 频繁调用会增加电量损耗，可考虑使用 wx.onLocationChange 监听地理位置变化' ){
             // 频繁调用时兼容处理
             this.location = oldLocation
             this.stationList = oldStationList
+            this.showFrame = true;
             uni.hideLoading();
             return
           }else if(locationData[0] !== null && locationData[0].errMsg === 'getLocation:fail:ERROR_NOCELL&WIFI_LOCATIONSWITCHOFF' ){
             this.location = "您的手机未开启定位"
+            this.showFrame = true;
             uni.hideLoading();
             return
           }else if(locationData[0] !== null){
             this.location = "没有获取到您的位置"
+            this.showFrame = true;
             uni.hideLoading();
             return
           }
-          
+          //#ifdef MP-WEIXIN
           const stationLocationData = await this.$Request({
             url: "/getStationInfoListNew",
             method: "GET",
@@ -171,12 +222,34 @@
               appId: this.appId
             }
           })
-
+          //#endif
+          //#ifdef MP-ALIPAY
+          const stationLocationData = await this.$Request({
+            url: "/getStationInfoListNewToAliPay",
+            method: "GET",
+            data: {
+              stationLongitude:locationData[1].longitude,
+              stationLatitude: locationData[1].latitude,
+              pageNum: 1,
+              pageSize:1000,
+              appId: this.appId
+            }
+          })
+          //#endif
           if(stationLocationData.retCode !== 0){
             throw new Error("获取定位信息失败")
           }
-          this.stationList = stationLocationData.data.stationInfoResponseList
+          
           this.location = stationLocationData.data.address
+        
+          if(settings.distanceFlag && settings.distanceShow==0){
+            this.goBuyReplace(stationLocationData.data.stationInfoResponseList[0].stationId)
+            this.stationList = []
+          }else{
+            this.showDistanceEmptyListTip = true
+            this.stationList = stationLocationData.data.stationInfoResponseList
+          }
+          
           // const stationLocationListData = await this.$Request({
           //   url: "/getStationInfoList",
           //   method: "GET",
@@ -203,7 +276,9 @@
         }
       },
       goBuy(e, stationId) {
-        e.stopPropagation()
+        if(!!e){
+          e.stopPropagation()
+        }
         this.updateStationId(stationId)
         this.clearEmployeeId()
         uni.navigateTo({
@@ -211,9 +286,19 @@
         })
         return
       },
-      goThere(e, latitude, longitude) {
+      goBuyReplace(stationId) {
+        this.updateStationId(stationId)
+        this.clearEmployeeId()
+        uni.redirectTo({
+          url: "/pages/index/index"
+        })
+        return
+      },
+      goThere(e, latitude, longitude, stationName, stationAddress) {
         e.stopPropagation()
         uni.openLocation({
+          name: stationName,
+          address: stationAddress,
           latitude: parseFloat(latitude),
           longitude: parseFloat(longitude),
           success: function() {
@@ -295,10 +380,6 @@
         
         
         .dist_search {
-          // position: absolute;
-          // top: 20rpx;
-          // left: 30rpx;
-          // width: 100%;
           height: 80rpx;
           max-width: 130rpx;
           white-space: nowrap;
@@ -329,9 +410,9 @@
         }
 
         .separate {
-          width: 1rpx;
+          width: 0rpx;
           height: 35rpx;
-          border: .5rpx solid #CCCCCC;
+          border: 1rpx solid #CCCCCC;
           box-sizing: border-box;
           // position: absolute;
           // top: 20rpx;
@@ -365,6 +446,9 @@
             width: 310rpx;
             height: 80rpx;
             line-height: 80rpx;
+            background:none;  
+            outline:none;  
+            border:none;
           }
         }
       }

pages/skip/skip.vue

@@ -34,7 +34,13 @@
       });
     },
     async onLoad(e) {
+      console.log(e)
+      // #ifdef  MP-WEIXIN
       const res = decodeURIComponent(e.q)
+      // #endif
+      // #ifdef  MP-ALIPAY
+      const res = e.qrCode
+      // #endif
       const parse = new Parse.getInstance();
       const info = await parse.parseCode(res).catch((e) => {
         uni.hideLoading()

pages/succeed1/succeed1.vue

@@ -1,245 +1,26 @@
 <template>
   <view class="succeed">
-    <view class="bg">
-      支付成功
-    </view>
-    <view class="container">
-
-      <view class="voucher">
-        <view class="title">支付凭证</view>
-        <view class="tip">请主动提供给加油员查看</view>
-        <view class="dashed">
-        </view>
-        <view class="arch">
-          <text></text>
-          <text></text>
-        </view>
-        <view class="content">
-          <view class="oil">
-            <text>油品</text>
-            <text>92#</text>
-          </view>
-          <view class="origin">
-            <text>应付</text>
-            <text>￥10.00</text>
-          </view>
-          <view class="amt">
-            <text>实付</text>
-            <text>￥11.20</text>
-          </view>
-          <view class="time">
-            <text>时间</text>
-            <text>11:20:00</text>
-          </view>
-        </view>
-
-      </view>
-
-      <view class="">
-        <view class="focus"> 更多优惠，请关注我们的公众号 </view>
-        <official-account class="official"></official-account>
-      </view>
-    </view>
+    <view class="icon"></view>
+    <view class="text">订单支付成功</view>
+    <!-- #ifdef MP-WEIXIN -->
+    <view class="focus"> 更多优惠，请关注我们的公众号 </view>
+    <official-account class="official"></official-account>
+    <!-- #endif    -->
+    <!--    <view class="menu">
+      <navigator class="text1" url="/pages/index/index">回到首页</navigator>
+      <navigator class="text2" url="/pages/confirm/confirm">回到首页</navigator>
+    </view> -->
   </view>
 </template>
 
 <script>
-  import {
-    mapState,
-    mapMutations
-  } from "vuex";
-
   export default {
     data() {
       return {
-        payType: 2, // 1电子卡 2微信
-        wxPayLoading: false,
-        creditPayLoading: false,
-        cardTypeTranslate: ['', '汽油卡', '柴油卡', '非油品卡', 'LNG', 'CNG']
-      };
-    },
-    computed: {
-      // ...mapState(["orderInfo", "selectedGas", "openId", "stationId"]),
-      // ...mapState({
-      //   orderInfo: state => state.order.orderInfo,
-      //   openId: state => state.user.openId,
-      //   stationId: state => state.station.stationId,
-      //   selectedGas: state => state.station.selectedGas,
-      // }),
-      availableCredit() {
-        if (this.orderInfo.oilsCardFlag == 0) {
-          return false
-        }
-        if ((+this.orderInfo.balance) < (+this.orderInfo.amt_dzk)) {
-          return false
-        }
-        return true
-      },
-      creditFlag() {
-        return this.orderInfo.oilsCardFlag == '1' ? true : false
+
       }
     },
-    created() {
-      // console.log(this.orderInfo)
-      // this.initPayType()
-    },
-    mounted() {
-      // this.$refs.pay.close()
-      // this.$refs.coupon.open();
-    },
     methods: {
-      ...mapMutations(["clearLabelId"]),
-      initPayType() {
-        if (this.orderInfo.oilsCardFlag == 1 && this.availableCredit) {
-          this.payType = 1
-        }
-      },
-      closeCoupon() {
-        this.$refs.coupon.close();
-      },
-      async creditPay() {
-        this.creditPayLoading = true;
-        if (this.payType === 2) {
-          this.wxPay()
-          return
-        }
-        uni.showLoading({
-          title: '支付中...',
-          mask: true
-        });
-        try {
-          const creditPayData = await this.$Request({
-            url: "/dzkPaySet",
-            data: {
-              "ordNo": this.orderInfo.ordNo
-            },
-          })
-          console.log(creditPayData)
-          if (creditPayData.retCode !== 0) {
-            throw new Error(creditPayData.message)
-          }
-          this.creditPayLoading = false;
-          uni.hideLoading();
-          uni.redirectTo({
-            url: "/pages/succeed/succeed"
-          })
-        } catch (e) {
-          this.creditPayLoading = false;
-          uni.hideLoading();
-          this.showToastAndGoback(e.toString())
-        }
-      },
-      async wxPay() {
-        this.wxPayLoading = true;
-        uni.showLoading({
-          title: '拉取支付...',
-          mask: true
-        });
-        try {
-          const JhPayData = await this.$Request({
-            url: "/getJhPayInfo",
-            method: "POST",
-            data: {
-              "ordNo": this.orderInfo.ordNo,
-              "openId": this.openId,
-              "stationId": this.stationId,
-              "userType": "1"
-            },
-          })
-          console.log(JhPayData)
-          if (JhPayData.retCode !== 0) {
-            throw new Error("请求信息失败")
-          }
-          if (JhPayData.data.code !== '0000') {
-            throw new Error(JhPayData.data.msg)
-          }
-
-          let timeStamp = JhPayData.data.respData.payTimeStamp;
-          let nonceStr = JhPayData.data.respData.paynonceStr;
-          let payPackage = JhPayData.data.respData.payPackage;
-          let signType = JhPayData.data.signType;
-          let paySign = JhPayData.data.respData.paySign;
-          // 填写随行付的信息，启动支付
-          const [payErr, payData] = await uni.requestPayment({
-            'timeStamp': timeStamp,
-            'nonceStr': nonceStr,
-            'package': payPackage,
-            'signType': signType,
-            'paySign': paySign,
-          })
-
-          if (!!payData && payData.errMsg === "requestPayment:ok") {
-            this.wxPayLoading = false;
-            this.clearLabelId();
-            uni.hideLoading();
-            uni.redirectTo({
-              url: "/pages/succeed/succeed"
-            })
-            return;
-          }
-          this.wxPayLoading = false;
-          uni.hideLoading();
-          if (payErr.errMsg === "requestPayment:fail cancel") {
-            this.showToastAndGoback("取消了支付")
-            return;
-          }
-          this.showToastAndGoback("支付失败")
-        } catch (e) {
-          this.wxPayLoading = false;
-          uni.hideLoading();
-          this.showToastAndGoback(e.message)
-        }
-      },
-      showToastAndGoback(title) {
-        uni.showToast({
-          title,
-          mask: true
-        })
-        setTimeout(() => {
-          uni.navigateBack({
-            delta: 1
-          })
-        }, 1500)
-      },
-
-      // selectPayType(type) {
-      //   if (!this.availableCredit && type == 1) {
-      //     return
-      //   }
-      //   if (type === this.payType) {
-      //     this.payType = ""
-      //     return
-      //   }
-      //   this.payType = type
-      // },
-
-      selectPayType() {
-        if (!this.availableCredit) {
-          return
-        }
-        if (this.payType === 1) {
-          this.payType = 2
-          return
-        }
-        this.payType = 1
-      },
-      goPay() {
-        if (this.payType === 2) {
-          this.wxPay()
-          return
-        }
-        if (this.payType === 1) {
-          // this.$refs.selectPayType.close();
-          this.$refs.pay.open()
-        }
-      },
-      backToSelectPayType() {
-        this.$refs.pay.close()
-        // this.$refs.selectPayType.open();
-      },
-      // closeSelectPayType() {
-      //   this.$refs.selectPayType.close();
-      // }
 
     }
   }
@@ -247,87 +28,65 @@
 
 <style lang="scss">
   page {
-    width: 750rpx;
-    background: #F2F2F2;
+    width: 100vw;
+    height: 100vh;
 
     .succeed {
-      .bg {
-        width: 750rpx;
-        height: 352rpx;
-        background: #0ca674;
+      text-align: center;
+
+      .icon {
+        margin-top: 300rpx;
+        display: inline-block;
+        width: 181rpx;
+        height: 181rpx;
+        background: url(../../static/icon/cg.2x.png) no-repeat 0px 0px;
+        background-size: 100% 100%;
       }
 
-      // 占位元素
-      .container {
-        width: 690rpx;
-        margin: 0 auto;
-        margin-top: -150rpx;
-
-        .voucher {
-          width: 690rpx;
-          height: 540rpx;
-          background: #FFFFFF;
-          border-radius: 14rpx;
-          box-sizing: border-box;
-          padding: 21rpx;
-          box-shadow: 0px 0px 20rpx 0px rgba(0, 0, 0, 0.1);
-
-          .title {
-            height: 44rpx;
-            font-size: 33rpx;
-            font-family: PingFangSC-Semibold, PingFang SC;
-            font-weight: bolder;
-            color: #1C1C27;
-            line-height: 44rpx;
-            text-align: center;
-          }
+      .text {
+        margin-top: 20rpx;
+        font-size: 34rpx;
+        font-weight: 600;
+      }
 
-          .tip {
-            height: 34rpx;
-            font-size: 30rpx;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: bold;
-            color: #F63932;
-            line-height: 34rpx;
-            text-align: center;
-            margin-top: 30rpx;
-          }
+      .focus {
+        margin-top: 100rpx;
+        display: inline-block;
+        font-weight: 500;
+        height: 40rpx;
+        font-size: 28rpx;
+        color: #c4c4c4;
+        line-height: 40rpx;
+      }
 
-          .dashed {
-            width: 500rpx;
-            border: 2rpx dashed #c0c0c0;
-            margin: 20rpx auto 0 auto;
-          }
-          .content{
-            height: 300rpx;
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-            margin: 40rpx 80rpx 0 80rpx;
-            
-            >view{
-              display: flex;
-              justify-content: space-between;
-              align-items: center;
-              
-              
-              text:nth-child(1){
-                font-size: 33rpx;
-                font-weight: bold;
-                color: #1C1C27;
-                line-height: 40rpx;
-              }
-              text:nth-child(2){
-                font-size: 33rpx;
-                font-weight: bold;
-                color: rgba(0, 0, 0, 0.5);
-                line-height: 40rpx;
-                color: #1C1C27;
-              }
-            }
-          }
-        }
+      .official {
+        display: inline-block;
+        width: 700rpx;
+        text-align: left;
       }
+
+      // .menu {
+      //   width: 600rpx;
+      //   height: 150rpx;
+      //   background: #ffffff;
+      //   box-shadow: 0px 2rpx 10rpx 5rpx rgba(227, 227, 227, 0.5);
+      //   border-radius: 20rpx;
+      //   display: flex;
+      //   flex-direction: row;
+      //   justify-content: space-around;
+      //   align-items: center;
+      //   position: absolute;
+      //   top: 50vh;
+      //   left: 10vw;
+
+      //   navigator {
+      //     height: 150rpx;
+      //     font-size: 30rpx;
+      //     font-weight: 500;
+      //     color: #111111;
+      //     line-height: 150rpx;
+      //   }
+      // }
     }
   }
 </style>

settings.js

@@ -1,45 +1,24 @@
-// 接口  定义接口前缀：demo-演示版  api-正式版
-
-
-
-// export const showIndex = false;
-// export const gasupList = true; 
-// 是否开始
-
-// appid
-// 站点Id
-
-// 智慧油驿站
-// 山东石化879站
-
-// export const isDemo = true;
-// export const prefix='demo';
-// export const appId = 'wxe1135cd390b38a54'
-// export const stationId = 1
-
-// export const isDemo = false;
-// export const prefix='api';
-// export const appId = 'wx5285c34adff1069d'
-// export const  stationId = 5;
-
-// export const isDemo = false;
-// export const prefix='demo';
-// export const appId = 'wxe1135cd390b38a54'
-// export const  stationId = 118;
-// const BASE_URL = 'http://localhost:8082'
 
 export default {
-  prefix:"demo",
-  // prefix:"prod",
-  // appId:"wxc0c46d44831aeeba",
-  // base_url:"https://www.huijy.net",
-  base_url:"https://mp.huijy.net",
-  // base_url:"192.168.31.99"
   
-  // prefix:"prod",
-  // appId:"wx34dd5a7c8c5be1ef",
+  // distanceFlag:true, // 定位后会自动进入距离较近的地址
+  distanceFlag:false, // 定位后不会自动进入距离较近的地址
+  distanceShow:1000000,   //依赖distanceFlag:true
+                     // 0 直接进入距离最近的油站 不显示列表页 
+                     // 100 拉取附近100公里内的油站列表
+  aLiDistanceShow:50,// 支付宝时此设置会覆盖distanceShow，而且支付宝的distanceFlag为true
+
+  // prefix:"test",  // 测试环境的前缀  
+  prefix:"demo",  // 测试环境的前缀
+  // prefix:"prod", // 正式环境的前缀
+  
+  // base_url:"https://www.huijy.net", // 正式环境的网址
+  base_url:"https://mp.huijy.net", // 测试环境的网址
+  
   appId:"wxe1135cd390b38a54",
+  
   // appId:"wxc0c46d44831aeeba",
+  // appId:"wx0c4cb575310ff9c4",
   // base_url:"https://www.huijy.net"
 } 
 

store/index.js

@@ -4,6 +4,8 @@ import settings from "@/settings.js"
 import user from '@/store/modules/user'
 import order from '@/store/modules/order'
 import station from '@/store/modules/station'
+import voucher from '@/store/modules/voucher'
+import coupon from '@/store/modules/coupon'
 
 Vue.use(Vuex)
 export default new Vuex.Store({
@@ -20,7 +22,6 @@ export default new Vuex.Store({
     // selectedGas:undefined,
     // labelId:undefined,
     // employeeId:undefined,
-    
   },
   getters: {
   },
@@ -83,17 +84,16 @@ export default new Vuex.Store({
     // clearLabelId(state){
     //   state.labelId = undefined
     // },
-    // resetApplet(state){
-    //   uni.clearStorageSync()
-    //   state.phoneNumber = ''
-    //   state.countryCode = ''
-    //   state.purePhoneNumber = ''
-    //   state.countryCode = ''
-    //   state.purePhoneNumber = ''
-    //   state.openId = ""
-    //   state.unionId = ""
-    //   state.userInfo = {}
-    // },
+    resetApplet(state){
+      uni.clearStorageSync()
+      state.user.phoneNumber = ''
+      state.user.countryCode = ''
+      state.user.purePhoneNumber = ''
+      state.user.openId = ""
+      state.user.unionId = ""
+      state.user.userInfo = {}
+      state.station.employeeId = undefined
+    },
     // updateEmployeeId(state, employeeId){
     //   state.employeeId = employeeId
     // },
@@ -107,6 +107,8 @@ export default new Vuex.Store({
   modules: {
     user,
     order,
-    station
+    station,
+    voucher,
+    coupon
   }
 })

store/modules/coupon.js

@@ -0,0 +1,22 @@
+export default {
+  state: {
+    couponEnabledFlag:'0', // 是否启用优惠券
+    couponList:undefined,  //  优惠券列表
+    succeedIssueId:undefined, // 支付成功后的展示位的issueId  
+  },
+  getters: {},
+  mutations: {
+    updateCouponEnabledFlag(state, couponEnabledFlag) {
+      state.couponEnabledFlag = couponEnabledFlag
+    },
+    updateSucceedIssueId(state, succeedIssueId) {
+      state.succeedIssueId = succeedIssueId
+    },
+    updateCouponList(state, couponList) {
+      state.couponList = couponList
+    },
+  },
+  actions: {
+  
+  }
+}

store/modules/order.js

@@ -6,7 +6,8 @@ export default {
   mutations: {
     updateOrderInfo(state, orderInfo) {
       state.orderInfo = orderInfo
-    },    
+    }, 
+    
   },
   actions: {
 

store/modules/voucher.js

@@ -0,0 +1,32 @@
+const getTime = ()=>{
+  const date = new Date()
+  let h = date.getHours().toString();
+  let m = date.getMinutes().toString();
+  let s = date.getSeconds().toString();
+  h = '' + (h.length == 1 ? '0':'') + h
+  m = '' + (m.length == 1 ? '0':'') + m
+  s = '' + (s.length == 1 ? '0':'') + s
+  console.log('' + h + ':' + m +':' + s)
+  return '' + h + ':' + m +':' + s
+}
+
+export default {
+  state: {
+    v_receivableAmt: undefined,
+    v_amt: undefined,
+    v_oilName: undefined,
+    v_time:''
+  },
+  getters: {},
+  mutations: {
+    updateVoucherInfo(state, voucherInfo) {
+      state.v_receivableAmt = voucherInfo.receivableAmt;
+      state.v_amt = voucherInfo.amt;
+      state.v_oilName =  voucherInfo.oilName;
+      state.v_time = getTime();
+    },    
+  },
+  actions: {
+
+  }
+}

unpackage/dist/dev/mp-alipay/.mini-ide/compileMode.json

@@ -0,0 +1,17 @@
+{
+  "modes": [
+    {
+      "title": "1",
+      "page": "pages/skip/skip",
+      "chInfo": "ch_scan",
+      "pageQuery": ""
+    },
+    {
+      "title": "测试二维码",
+      "page": "pages/skip/skip",
+      "chInfo": "ch_scan",
+      "query": "",
+      "pageQuery": "qrCode=https%3A%2F%2Fgoto.huijy.net%2F123%2FZTE1Lw"
+    }
+  ]
+}

unpackage/dist/dev/mp-alipay/.mini-ide/project-ide.json

@@ -0,0 +1,5 @@
+{
+  "disableRemoteDebugSourcePanel": true,
+  "enableLegacyRemoteDebug": false,
+  "enableCloudBuild": false
+}

unpackage/dist/dev/mp-alipay/.tea/entryFiles-development/config$.js

@@ -1,7 +0,0 @@
-
-const g = typeof global !== 'undefined' ? global : self;
-g.appXAppJson = {
-  "app": {
-    "$homepage": "pages/index/index"
-  }
-};

unpackage/dist/dev/mp-alipay/.tea/entryFiles-development/importScripts$.js

@@ -1,4 +0,0 @@
-if(!self.Map || !self.Set || !self.Symbol) {
-    importScripts('https://gw.alipayobjects.com/as/g/appx_release/deps/1.0.3/es6-set-map-symbol.js');
-     }
-     

unpackage/dist/dev/mp-alipay/.tea/entryFiles-development/index$.web.js

@@ -1,13 +0,0 @@
-require('@alipay/appx-compiler/lib/sjsEnvInit');
-require('./config$');
-
-require('../../uni_modules/uni-icons/components/uni-icons/uni-icons?hash=ec7c5687c7f2ffa836caf3a93e877914426baff6');
-require('../../uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar?hash=dae325d4c951895b814354c64fe84b4607f17cd3');
-require('../../uni_modules/uni-transition/components/uni-transition/uni-transition?hash=ec7c5687c7f2ffa836caf3a93e877914426baff6');
-require('../../uni_modules/uni-popup/components/uni-popup/uni-popup?hash=489c6f1237693efc95eb079e631461f2cea54e4d');
-require('../../pages/index/index?hash=c75c6855daa62dd296d5f406dabf5a105a69a6fa');
-require('../../pages/test/test?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/succeed/succeed?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/authen/identity?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/authen/login?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/confirm/confirm?hash=adadad05091b0634963281964ccbb9b87218ff21');

unpackage/dist/dev/mp-alipay/.tea/entryFiles-development/index$.worker.js

@@ -1,50 +0,0 @@
-if(!self.__appxInited) {
-self.__appxInited = 1;
-
-
-require('./config$');
-
-
-      function getUserAgentInPlatformWeb() {
-        return typeof navigator !== 'undefined' ? navigator.swuserAgent || navigator.userAgent || '' : '';
-      }
-      if(getUserAgentInPlatformWeb() && (getUserAgentInPlatformWeb().indexOf('LyraVM') > 0 || getUserAgentInPlatformWeb().indexOf('AlipayIDE') > 0) ) {
-        var AFAppX = self.AFAppX.getAppContext ? self.AFAppX.getAppContext().AFAppX : self.AFAppX;
-      } else {
-        importScripts('https://appx/af-appx.worker.min.js');
-        var AFAppX = self.AFAppX;
-      }
-      self.getCurrentPages = AFAppX.getCurrentPages;
-      self.getApp = AFAppX.getApp;
-      self.Page = AFAppX.Page;
-      self.App = AFAppX.App;
-      self.my = AFAppX.bridge || AFAppX.abridge;
-      self.abridge = self.my;
-      self.Component = AFAppX.WorkerComponent || function(){};
-      self.$global = AFAppX.$global;
-      self.requirePlugin = AFAppX.requirePlugin;
-    
-
-if(AFAppX.registerApp) {
-  AFAppX.registerApp({
-    appJSON: appXAppJson,
-  });
-}
-
-
-
-function success() {
-require('../../app');
-require('../../uni_modules/uni-icons/components/uni-icons/uni-icons?hash=ec7c5687c7f2ffa836caf3a93e877914426baff6');
-require('../../uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar?hash=dae325d4c951895b814354c64fe84b4607f17cd3');
-require('../../uni_modules/uni-transition/components/uni-transition/uni-transition?hash=ec7c5687c7f2ffa836caf3a93e877914426baff6');
-require('../../uni_modules/uni-popup/components/uni-popup/uni-popup?hash=489c6f1237693efc95eb079e631461f2cea54e4d');
-require('../../pages/index/index?hash=c75c6855daa62dd296d5f406dabf5a105a69a6fa');
-require('../../pages/test/test?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/succeed/succeed?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/authen/identity?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/authen/login?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/confirm/confirm?hash=adadad05091b0634963281964ccbb9b87218ff21');
-}
-self.bootstrapApp ? self.bootstrapApp({ success }) : success();
-}

unpackage/dist/dev/mp-alipay/app.json

@@ -1,11 +1,13 @@
 {
   "pages": [
+    "pages/list/list",
     "pages/index/index",
     "pages/test/test",
     "pages/succeed/succeed",
     "pages/authen/identity",
     "pages/authen/login",
-    "pages/confirm/confirm"
+    "pages/confirm/confirm",
+    "pages/skip/skip"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/dev/mp-alipay/common/main.acss

@@ -13,5 +13,101 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*每个页面公共css */
 

unpackage/dist/dev/mp-alipay/common/main.js

@@ -1,17 +1,17 @@
 (my["webpackJsonp"] = my["webpackJsonp"] || []).push([["common/main"],[
 /* 0 */
-/*!*************************************************************!*\
-  !*** C:/Users/first/Documents/HBuilderProjects/小程序/main.js ***!
-  \*************************************************************/
+/*!*************************************************!*\
+  !*** C:/Users/first/Desktop/公司/applets/main.js ***!
+  \*************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(createApp) {__webpack_require__(/*! uni-pages */ 4);__webpack_require__(/*! @dcloudio/uni-stat */ 5);var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
-var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 9));
-var _store = _interopRequireDefault(__webpack_require__(/*! ./store */ 15));
+/* WEBPACK VAR INJECTION */(function(createApp) {__webpack_require__(/*! uni-pages */ 5);__webpack_require__(/*! @dcloudio/uni-stat */ 6);var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
+var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 10));
+var _store = _interopRequireDefault(__webpack_require__(/*! ./store */ 16));
 
-var _api = __webpack_require__(/*! ./util/api.js */ 20);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}
+var _api = __webpack_require__(/*! ./util/api.js */ 24);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}
 
 
 
@@ -31,6 +31,22 @@ _vue.default.config.warnHandler = function (msg) {
     return console.warn && console.warn(msg);
   }
 };
+// 全局注入
+_vue.default.mixin({
+  computed: {
+    appId: function appId() {return _store.default.state.appId;},
+    phoneNumber: function phoneNumber() {return _store.default.state.user.phoneNumber;},
+    openId: function openId() {return _store.default.state.user.openId;},
+    unionId: function unionId() {return _store.default.state.user.unionId;},
+    userInfo: function userInfo() {return _store.default.state.user.userInfo;},
+    stationId: function stationId() {return _store.default.state.station.stationId;},
+    selectedGas: function selectedGas() {return _store.default.state.station.selectedGas;},
+    labelId: function labelId() {return _store.default.state.station.labelId;},
+    employeeId: function employeeId() {return _store.default.state.station.employeeId;},
+    orderInfo: function orderInfo() {return _store.default.state.order.orderInfo;} } });
+
+
+
 
 
 var app = new _vue.default(_objectSpread({
@@ -49,19 +65,20 @@ createApp(app).$mount();
 /* 6 */,
 /* 7 */,
 /* 8 */,
-/* 9 */
-/*!*************************************************************!*\
-  !*** C:/Users/first/Documents/HBuilderProjects/小程序/App.vue ***!
-  \*************************************************************/
+/* 9 */,
+/* 10 */
+/*!*************************************************!*\
+  !*** C:/Users/first/Desktop/公司/applets/App.vue ***!
+  \*************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./App.vue?vue&type=script&lang=js& */ 10);
+/* harmony import */ var _App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./App.vue?vue&type=script&lang=js& */ 11);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./App.vue?vue&type=style&index=0&lang=css& */ 12);
-/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 14);
+/* harmony import */ var _App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./App.vue?vue&type=style&index=0&lang=css& */ 13);
+/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 15);
 var render, staticRenderFns, recyclableRender, components
 var renderjs
 
@@ -88,61 +105,158 @@ component.options.__file = "App.vue"
 /* harmony default export */ __webpack_exports__["default"] = (component.exports);
 
 /***/ }),
-/* 10 */
-/*!**************************************************************************************!*\
-  !*** C:/Users/first/Documents/HBuilderProjects/小程序/App.vue?vue&type=script&lang=js& ***!
-  \**************************************************************************************/
+/* 11 */
+/*!**************************************************************************!*\
+  !*** C:/Users/first/Desktop/公司/applets/App.vue?vue&type=script&lang=js& ***!
+  \**************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js& */ 11);
+/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js& */ 12);
 /* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
-/* 11 */
-/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-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!C:/Users/first/Documents/HBuilderProjects/小程序/App.vue?vue&type=script&lang=js& ***!
-  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/* 12 */
+/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-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!C:/Users/first/Desktop/公司/applets/App.vue?vue&type=script&lang=js& ***!
+  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default =
+/* WEBPACK VAR INJECTION */(function(wx) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;function _classCallCheck(instance, Constructor) {if (!(instance instanceof Constructor)) {throw new TypeError("Cannot call a class as a function");}}function _defineProperties(target, props) {for (var i = 0; i < props.length; i++) {var descriptor = props[i];descriptor.enumerable = descriptor.enumerable || false;descriptor.configurable = true;if ("value" in descriptor) descriptor.writable = true;Object.defineProperty(target, descriptor.key, descriptor);}}function _createClass(Constructor, protoProps, staticProps) {if (protoProps) _defineProperties(Constructor.prototype, protoProps);if (staticProps) _defineProperties(Constructor, staticProps);return Constructor;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}
+var updateManager = null;
+var canIUse = true;var
+
+WxUpdate = /*#__PURE__*/function () {function WxUpdate() {_classCallCheck(this, WxUpdate);_defineProperty(this, "updateManager",
+    wx.getUpdateManager());_defineProperty(this, "canIUse",
+    wx.canIUse('getUpdateManager'));}_createClass(WxUpdate, [{ key: "check", value: function check()
+
+
+
+
+
+
+
+
+    {
+      var that = this;
+      if (that.canIUse) {
+        that.updateManager.onCheckForUpdate(function (res) {
+          if (res.hasUpdate) {
+            wx.showModal({
+              title: '升级提示',
+              content: '检测到新版本，是否下载新版本并重启小程序？',
+              showCancel: false,
+              success: function success(res) {
+                if (res.confirm) {
+                  that.downLoadAndUpdateApplet();
+                } else if (res.cancel) {
+                  wx.showModal({
+                    title: '温馨提示~',
+                    content: '本次版本更新比较重要，旧版本可能无法正常访问的哦~',
+                    showCancel: false,
+                    confirmText: "确定更新",
+                    success: function success(res) {
+                      if (res.confirm) {
+                        that.downLoadAndUpdateApplet();
+                      }
+                    } });
+
+                }
+              } });
+
+          }
+          // 不走if就是最新版
+        });
+      } else {
+        that.downLoadAndUpdateWeChat();
+      }
+    } }, { key: "downLoadAndUpdateApplet", value: function downLoadAndUpdateApplet()
+    {
+      var that = this;
+      wx.showModal({
+        title: '升级提示',
+        showCancel: false,
+        content: '如果小程序自动升级失败~请您手动删除当前小程序后，重新打开小程序~',
+        success: function success(res) {
+          wx.showLoading();
+          that.updateManager.onUpdateReady(function () {
+            wx.hideLoading();
+            that.updateManager.applyUpdate();
+          });
+        } });
+
+
+      that.updateManager.onUpdateFailed(function () {
+        wx.hideLoading();
+        wx.showModal({
+          title: '已经有新版本了哟~',
+          content: '新版本已经上线啦~，请您删除当前小程序，重新从公众号或搜索打开小程序哟~' });
+
+      });
+    } }, { key: "downLoadAndUpdateWeChat", value: function downLoadAndUpdateWeChat()
+    {
+      wx.showModal({
+        title: '重要提示',
+        content: '您当前微信版本过低，使用过程可能会不稳定。点击确认立刻升级微信。',
+        success: function success(res) {
+          if (res.confirm) {
+            wx.updateWeChatApp({
+              success: function success(res) {
+                console.log('res', res);
+              },
+              fail: function fail(err) {
+                console.log('err', err);
+              } });
+
+          }
+        } });
+
+    } }], [{ key: "getInstance", value: function getInstance() {if (!this.instance) {this.instance = new WxUpdate();}return this.instance;} }]);return WxUpdate;}();var _default =
+
+
 {
   onLaunch: function onLaunch() {
-    console.log('App Launch');
+
+
+
   },
   onShow: function onShow() {
-    console.log('App Show');
+
+
+
+
   },
   onHide: function onHide() {
     console.log('App Hide');
   } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-alipay/dist/index.js */ 1)["default"]))
 
 /***/ }),
-/* 12 */
-/*!**********************************************************************************************!*\
-  !*** C:/Users/first/Documents/HBuilderProjects/小程序/App.vue?vue&type=style&index=0&lang=css& ***!
-  \**********************************************************************************************/
+/* 13 */
+/*!**********************************************************************************!*\
+  !*** C:/Users/first/Desktop/公司/applets/App.vue?vue&type=style&index=0&lang=css& ***!
+  \**********************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=css& */ 13);
+/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=css& */ 14);
 /* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
-/* 13 */
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-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--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/first/Documents/HBuilderProjects/小程序/App.vue?vue&type=style&index=0&lang=css& ***!
-  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/* 14 */
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-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--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/first/Desktop/公司/applets/App.vue?vue&type=style&index=0&lang=css& ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-alipay/mini.project.json

@@ -2,5 +2,6 @@
   "uniStatistics": {
     "enable": true
   },
-  "appid": "2021002140684377"
+  "appid": "2021002140684377",
+  "component2": true
 }

unpackage/dist/dev/mp-alipay/pages/authen/identity.acss

@@ -49,16 +49,9 @@ page .container .hr {
 }
 page .container .content {
   margin-top: 90rpx;
-  display: -webkit-inline-box;
-  display: -webkit-inline-flex;
   display: inline-flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-          flex-direction: column;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-          justify-content: center;
+  flex-direction: column;
+  justify-content: center;
   width: 616rpx;
 }
 page .container .content text:nth-child(1) {
@@ -80,7 +73,6 @@ page .container button {
   display: inline-block;
   width: 616rpx;
   height: 76rpx;
-  background: -webkit-linear-gradient(327deg, #12A273 0%, #12A273 100%);
   background: linear-gradient(123deg, #12A273 0%, #12A273 100%);
   border-radius: 38rpx;
   font-size: 32rpx;

unpackage/dist/dev/mp-alipay/pages/authen/identity.axml

@@ -1 +1 @@
-<view class="container"><image class="icon" src="../../static/icon/login.png" mode="scaleToFill"></image><view class="hr"></view><view class="content"><text>申请获取以下权限</text><text>获得你的公开信息（昵称、头像、地区等）</text></view><button loading="{{getUserInfoLoading}}" disabled="{{getUserInfoLoading}}" open-type="getAuthorize" scope="userInfo" data-event-opts="{{[['getAuthorize',[['getUserInfo',['$event']]]],['onError',[['onAuthError',['$event']]]]]}}" onGetAuthorize="__e" onOnError="__e">支付宝授权获取</button><button data-event-opts="{{[['tap',[['getCode',['$event']]]]]}}" onTap="__e">code获取</button><button open-type="getAuthorize" scope="phoneNumber" data-event-opts="{{[['tap',[['getCode',['$event']]]],['getAuthorize',[['$onAliGetAuthorize',['getPhoneNumber','$event']]]],['error',[['$onAliAuthError',['getPhoneNumber','$event']]]]]}}" onTap="__e" onGetAuthorize="__e" onError="__e">手机号获取</button></view>
+<view class="container"><image class="icon" src="../../static/icon/login.png" mode="scaleToFill"></image><view class="hr"></view><view class="content"><text>申请获取以下权限</text><text>获得你的公开信息（昵称、头像、地区等）</text></view><button loading="{{getUserInfoLoading}}" disabled="{{getUserInfoLoading}}" data-event-opts="{{[['tap',[['getAliInfo',['$event']]]]]}}" onTap="__e">授权获取</button></view>

unpackage/dist/dev/mp-alipay/pages/authen/login.acss

@@ -40,22 +40,14 @@ page .container .icon {
   display: inline-block;
 }
 page .container .content {
-  display: -webkit-inline-box;
-  display: -webkit-inline-flex;
   display: inline-flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-          flex-direction: column;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-          justify-content: center;
+  flex-direction: column;
+  justify-content: center;
   margin-top: 210rpx;
 }
 page .container .content button:nth-child(1) {
   width: 616rpx;
   height: 76rpx;
-  background: -webkit-linear-gradient(327deg, #12A273 0%, #12A273 100%);
   background: linear-gradient(123deg, #12A273 0%, #12A273 100%);
   border-radius: 38rpx;
   font-size: 32rpx;

unpackage/dist/dev/mp-alipay/pages/authen/login.axml

@@ -1 +1 @@
-<view class="container"><image class="icon" src="../../static/icon/login.png" mode="scaleToFill"></image><view class="content"><button open-type="getAuthorize" loading="{{getPhoneNumberLoading}}" disabled="{{getPhoneNumberLoading}}" scope="phoneNumber" data-event-opts="{{[['getAuthorize',[['$onAliGetAuthorize',['getPhoneNumber','$event']]]],['error',[['$onAliAuthError',['getPhoneNumber','$event']]]]]}}" onGetAuthorize="__e" onError="__e">授权登录</button><button type="default">手机登录</button><text>登录即代表同意《隐私政策》和《用户服务协议》</text></view></view>
+<view class="container">{{''+error+''}}<image class="icon" src="../../static/icon/login.png" mode="scaleToFill"></image><view class="content"><button open-type="getAuthorize" scope="phoneNumber" data-event-opts="{{[['getAuthorize',[['$onAliGetAuthorize',['getPhoneNumber','$event']]]],['error',[['$onAliAuthError',['getPhoneNumber','$event']]]]]}}" onGetAuthorize="__e" onError="__e">授权登录</button><button type="default">手机登录</button><text>登录即代表同意《隐私政策》和《用户服务协议》</text></view></view>

unpackage/dist/dev/mp-alipay/pages/confirm/confirm.acss

@@ -45,15 +45,9 @@ page .confirm .container .station {
   border-radius: 14rpx;
   box-sizing: border-box;
   padding: 21rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-          justify-content: space-between;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
+  justify-content: space-between;
+  align-items: center;
 }
 page .confirm .container .station image {
   width: 200rpx;
@@ -62,44 +56,24 @@ page .confirm .container .station image {
 page .confirm .container .station .info {
   width: 400rpx;
   height: 240rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-          flex-direction: column;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-          justify-content: space-between;
-  -webkit-box-align: start;
-  -webkit-align-items: flex-start;
-          align-items: flex-start;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: flex-start;
 }
 page .confirm .container .station .info .content {
   height: 180rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-          flex-direction: column;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-          justify-content: space-between;
+  flex-direction: column;
+  justify-content: space-between;
   font-size: 28rpx;
   font-weight: 400;
   color: #666666;
   line-height: 40rpx;
 }
 page .confirm .container .station .info .content view {
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-          justify-content: space-between;
+  justify-content: space-between;
 }
 page .confirm .container .station .info .content view text:nth-child(1) {
   width: 200rpx;
@@ -119,15 +93,9 @@ page .confirm .container > view:not(.station) {
   box-shadow: 0px 2rpx 6rpx 5rpx rgba(237, 237, 237, 0.5);
   border-radius: 10rpx;
   margin-top: 20rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-          justify-content: space-between;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
+  justify-content: space-between;
+  align-items: center;
   box-sizing: border-box;
   padding: 20rpx;
   font-size: 28rpx;
@@ -136,15 +104,9 @@ page .confirm .container > view:not(.station) {
   line-height: 40rpx;
 }
 page .confirm .container > view:not(.station) > view {
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-          justify-content: space-between;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
+  justify-content: space-between;
+  align-items: center;
 }
 page .confirm .container > view:not(.station) > view .icon {
   display: inline-block;
@@ -169,7 +131,6 @@ page .confirm .container > view:not(.station) > view .vip {
   background-size: 100% 100%;
 }
 page .confirm .container > view:not(.station) text.price {
-  font-size: 24rpx;
   color: #F3B235;
   line-height: 33rpx;
 }
@@ -180,10 +141,13 @@ page .confirm .container > view:not(.station) text.vip {
 }
 page .confirm .container view.dispose {
   width: 690rpx;
-  height: 138rpx;
+  height: 150rpx;
   position: relative;
   display: inline-block;
 }
+page .confirm .container view.dispose .coupon_bg {
+  display: none;
+}
 page .confirm .container view.dispose .title {
   position: absolute;
   top: 36rpx;
@@ -196,6 +160,7 @@ page .confirm .container view.dispose .title text:nth-child(1) {
   color: #000000;
   line-height: 40rpx;
   margin-right: 20rpx;
+  margin-left: 5rpx;
 }
 page .confirm .container view.dispose .title text:nth-child(2) {
   height: 28rpx;
@@ -218,8 +183,8 @@ page .confirm .container view.dispose .tip .icon {
   background: url(/static/icon/tipicon1.png) no-repeat 0px 0px;
   background-size: 100% 100%;
 }
-page .confirm .container view.dispose .tip text:nth-child(2) {
-  width: 220rpx;
+page .confirm .container view.dispose .tip text:nth-child(2),
+page .confirm .container view.dispose .tip text:nth-child(3) {
   height: 28rpx;
   font-size: 20rpx;
   font-family: PingFangSC-Regular, PingFang SC;
@@ -227,14 +192,41 @@ page .confirm .container view.dispose .tip text:nth-child(2) {
   color: rgba(0, 0, 0, 0.4);
   line-height: 28rpx;
 }
+page .confirm .container view.dispose .tip text:nth-child(2) text,
+page .confirm .container view.dispose .tip text:nth-child(3) text {
+  font-size: 27rpx;
+  font-weight: 800rpx;
+  color: #838383;
+}
 page .confirm .container view.coupon .extra {
   position: absolute;
-  right: 20rpx;
-  top: 54rpx;
-  height: 34rpx;
+  right: 0rpx;
+  top: 0rpx;
+  height: 150rpx;
+  width: 250rpx;
   font-size: 24rpx;
   color: #6D6D6D;
-  line-height: 34rpx;
+  line-height: 150rpx;
+  color: #249bdd;
+  font-weight: bold;
+  text-align: center;
+}
+page .confirm .container view.coupon .disable {
+  color: #6D6D6D;
+}
+page .confirm .container view.coupon.direct {
+  background: url(/static/icon/quan1.2x.png) no-repeat;
+  background-size: 100% 100%;
+}
+page .confirm .container view.coupon.direct > .title text:nth-child(2) {
+  color: #FF2;
+}
+page .confirm .container view.coupon.rate {
+  background: url(/static/icon/quan2.2x.png) no-repeat;
+  background-size: 100% 100%;
+}
+page .confirm .container view.coupon.rate > .title text:nth-child(2) {
+  color: #FD2;
 }
 page .confirm .container view.dzk .extra {
   position: absolute;
@@ -266,28 +258,32 @@ page .confirm .submit .area {
   bottom: 0;
   left: 0;
   right: 0;
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-pack: end;
-  -webkit-justify-content: flex-end;
-          justify-content: flex-end;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
-}
-page .confirm .submit .area text:nth-child(1) {
+  justify-content: flex-end;
+  align-items: center;
+}
+page .confirm .submit .area > .type {
   font-size: 28rpx;
   font-weight: 400;
   color: #111111;
   line-height: 40rpx;
 }
-page .confirm .submit .area text:nth-child(2) {
+page .confirm .submit .area > .amount {
   font-size: 30rpx;
   font-weight: 600;
   color: #f3b338;
   line-height: 40rpx;
 }
+page .confirm .submit .area > .icon {
+  background: url(/static/icon/1_b01_down.2x.png) no-repeat 0px 0px;
+  background-size: 100% 100%;
+  display: inline-block;
+  width: 13rpx;
+  height: 8rpx;
+  line-height: 40rpx;
+  margin-left: 10rpx;
+  margin-right: 15rpx;
+}
 page .confirm .submit .area .btn {
   margin-left: 20rpx;
   margin-right: 30rpx;
@@ -326,15 +322,9 @@ page .confirm uni-popup.pay .cont .amount {
   color: #000000;
   position: absolute;
   top: 112rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-          justify-content: center;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
+  justify-content: center;
+  align-items: center;
 }
 page .confirm uni-popup.pay .cont .amount text {
   font-size: 40rpx;
@@ -376,7 +366,6 @@ page .confirm uni-popup.pay .cont .type text:nth-child(3) {
 page .confirm uni-popup.pay .cont .pay {
   width: 590rpx;
   height: 76rpx;
-  background: -webkit-linear-gradient(347deg, #12A273 0%, #25AA7E 100%);
   background: linear-gradient(103deg, #12A273 0%, #25AA7E 100%);
   border-radius: 38rpx;
   font-size: 28rpx;
@@ -419,12 +408,8 @@ page .confirm uni-popup.selectPayType .cont .credit {
 }
 page .confirm uni-popup.selectPayType .cont .credit .credit-con {
   height: 60rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-          justify-content: space-between;
+  justify-content: space-between;
 }
 page .confirm uni-popup.selectPayType .cont .credit .credit-con .text {
   font-size: 28rpx;
@@ -460,13 +445,9 @@ page .confirm uni-popup.selectPayType .cont .wx {
   top: 305rpx;
   padding: 0 30rpx;
   height: 40rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
   box-sizing: border-box;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-          justify-content: space-between;
+  justify-content: space-between;
 }
 page .confirm uni-popup.selectPayType .cont .wx .text {
   font-size: 28rpx;
@@ -500,7 +481,6 @@ page .confirm uni-popup.selectPayType .cont > button {
   left: 80rpx;
 }
 page .confirm uni-popup.selectPayType .cont > button.available {
-  background: -webkit-linear-gradient(347deg, #12A273 0%, #25AA7E 100%);
   background: linear-gradient(103deg, #12A273 0%, #25AA7E 100%);
 }
 page .confirm uni-popup.coupon .coupon-container {
@@ -531,95 +511,158 @@ page .confirm uni-popup.coupon .coupon-container > .title {
   text-align: center;
 }
 page .confirm uni-popup.coupon .coupon-container .coupon-scroll {
-  max-height: 500rpx;
+  max-height: 600rpx;
   overflow: scroll;
 }
-page .confirm uni-popup.coupon .coupon-container .coupon-scroll .item {
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon {
+  display: flex;
+  justify-content: space-between;
   width: 690rpx;
   height: 160rpx;
+  margin-bottom: 50rpx;
+  box-shadow: 0 0 10rpx 4rpx rgba(233, 223, 223, 0.5);
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .left {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  text-align: center;
+  width: 220rpx;
+  height: 160rpx;
+  text-align: center;
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .left .amount {
+  display: block;
+  font-size: 40rpx;
+  font-weight: 500;
+  color: #ffffff;
+  line-height: 56rpx;
+  text-align: center;
+  margin-top: 0;
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .left .amount .value {
+  font-size: 50rpx;
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .left .condition {
   font-size: 24rpx;
+  font-weight: 400;
+  color: #ffffff;
+  line-height: 33rpx;
+  text-align: center;
+  margin-top: 25rpx;
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .left .exchangeName {
+  display: none;
+  font-size: 35rpx;
   font-weight: 500;
-  color: #FFFFFF;
-  line-height: 40rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-          justify-content: space-between;
-  margin-bottom: 20rpx;
+  color: #ffffff;
+  line-height: 56rpx;
 }
-page .confirm uni-popup.coupon .coupon-container .coupon-scroll .item .left {
-  width: 150rpx;
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .right {
+  width: 456rpx;
   height: 160rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-          flex-direction: column;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-          justify-content: center;
+  flex-direction: column;
+  justify-content: space-between;
+  margin: 8rpx 0 5rpx 0;
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .right .title {
+  height: 30rpx;
+  font-size: 24rpx;
+  font-weight: 600;
+  line-height: 33rpx;
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .right .title .type {
+  width: 113rpx;
+  height: 30rpx;
+  line-height: 30rpx;
+  display: inline-block;
+  background: #f8c;
+  border-radius: 19rpx;
+  font-size: 24rpx;
+  font-weight: 600;
+  color: #ffffff;
   text-align: center;
 }
-page .confirm uni-popup.coupon .coupon-container .coupon-scroll .item .left .amount {
-  font-size: 20rpx;
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .right .content {
+  display: flex;
+  justify-content: space-between;
+  margin: 5rpx 0 5rpx 0;
+  height: 120rpx;
 }
-page .confirm uni-popup.coupon .coupon-container .coupon-scroll .item .left .amount .big {
-  font-size: 33rpx;
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .right .content > .items {
+  width: 360rpx;
+  height: 100%;
+  display: flex;
+  justify-content: space-around;
+  flex-direction: column;
 }
-page .confirm uni-popup.coupon .coupon-container .coupon-scroll .item .right {
-  width: 540rpx;
-  height: 160rpx;
-  color: #111111;
-  position: relative;
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .right .content > .items .item {
+  color: #272626;
+  font-size: 21rpx;
 }
-page .confirm uni-popup.coupon .coupon-container .coupon-scroll .item .right .title {
-  position: absolute;
-  top: 22rpx;
-  left: 20rpx;
-  height: 40rpx;
-  font-size: 28rpx;
-  font-weight: 500;
-  line-height: 40rpx;
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .right .content > .items .item > text {
+  width: 230rpx;
+  display: inline-block;
+  color: #272626;
+  font-size: 22rpx;
+  font-weight: bold;
+  overflow: scroll;
+  /* 超出部分隐藏 */
+  white-space: nowrap;
+  /* 文本不换行 */
 }
-page .confirm uni-popup.coupon .coupon-container .coupon-scroll .item .right .scope {
-  position: absolute;
-  top: 72rpx;
-  left: 20rpx;
-  height: 28rpx;
-  font-size: 20rpx;
-  color: #666666;
-  line-height: 28rpx;
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .right .content > .items .from {
+  display: block;
 }
-page .confirm uni-popup.coupon .coupon-container .coupon-scroll .item .right .valid {
-  position: absolute;
-  top: 110rpx;
-  left: 20rpx;
-  height: 28rpx;
-  font-size: 20rpx;
-  color: #666666;
-  line-height: 28rpx;
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .right .content > .btn {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  margin-right: 10rpx;
+  width: 70rpx;
 }
-page .confirm uni-popup.coupon .coupon-container .coupon-scroll .item .right .use {
-  position: absolute;
-  top: 54rpx;
-  right: 20rpx;
-  display: inline-block;
-  width: 160rpx;
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .right .content > .btn .extra {
+  background: url(/static/icon/select.png) no-repeat 0px 0px;
+  background-size: 100% 100%;
+  width: 55rpx;
   height: 55rpx;
+  margin-right: 20rpx;
+  margin-top: -10rpx;
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .coupon > .right .content > .btn .selected {
+  background: url(/static/icon/selected.png) no-repeat 0px 0px;
+  background-size: 100% 100%;
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .direct > .left {
+  background: url(/static/icon/quan1.2x.png) no-repeat;
+  background-size: 100% 100%;
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .direct > .right > .title > .type {
+  background: #f8ce57;
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .direct > .right > .content > .btn button {
+  background: linear-gradient(143deg, #fad965 0%, #f3b235 100%);
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .rate > .left {
+  background: url(/static/icon/quan2.2x.png) no-repeat;
+  background-size: 100% 100%;
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .rate > .right > .title > .type {
+  background: #eb8573;
+}
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .rate > .right > .content > .btn button {
+  background: linear-gradient(143deg, #f4a796 0%, #e67462 100%);
 }
 page .confirm uni-popup.coupon .coupon-container .coupon-scroll .cash {
   background: url(/static/icon/youhuiquan1.2x.png) no-repeat 0px 0px;
   background-size: 100% 100%;
 }
-page .confirm uni-popup.coupon .coupon-container .coupon-scroll .discount {
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .exchange {
   background: url(/static/icon/youhuiquan2.2x.png) no-repeat 0px 0px;
   background-size: 100% 100%;
 }
-page .confirm uni-popup.coupon .coupon-container .coupon-scroll .exchange {
+page .confirm uni-popup.coupon .coupon-container .coupon-scroll .discount {
   background: url(/static/icon/youhuiquan3.2x.png) no-repeat 0px 0px;
   background-size: 100% 100%;
 }

unpackage/dist/dev/mp-alipay/pages/index/index.acss

@@ -42,21 +42,12 @@ page .content .box {
   border-radius: 36rpx 36rpx 0px 0px;
   box-shadow: 0 -2rpx 2rpx rgba(0, 0, 0, 0.1);
   padding: 40rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-          flex-direction: column;
+  flex-direction: column;
 }
 page .content .box .title {
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-          justify-content: space-between;
+  justify-content: space-between;
 }
 page .content .box .title .left {
   height: 42rpx;
@@ -93,15 +84,10 @@ page .content .box .notice-bar-container .uni-noticebar {
   overflow: hidden;
 }
 page .content .box .gun {
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-flex-wrap: wrap;
-          flex-wrap: wrap;
-  -webkit-justify-content: space-around;
-          justify-content: space-around;
-  -webkit-align-content: space-around;
-          align-content: space-around;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  align-content: space-around;
   margin-top: 30rpx;
 }
 page .content .box .gun view {
@@ -110,16 +96,9 @@ page .content .box .gun view {
   background: rgba(255, 255, 255, 0.08);
   box-shadow: 0px 2rpx 9rpx 4rpx rgba(16, 178, 125, 0.1);
   border-radius: 12rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-          flex-direction: column;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-          justify-content: center;
+  flex-direction: column;
+  justify-content: center;
   text-align: center;
   margin-bottom: 20rpx;
 }
@@ -147,6 +126,12 @@ page .content .box .gun view text.more {
   line-height: 100rpx;
   margin-top: 0;
 }
+page .content .box .gun view.lengthIs2Or4 {
+  width: 280rpx;
+}
+page .content .box .gun view.lengthIs1 {
+  width: 480rpx;
+}
 page .content .box .gun view.selected {
   background-color: #0ea374;
 }
@@ -185,15 +170,9 @@ page .content .box .amount .inp text {
   line-height: 33rpx;
 }
 page .content .box .amount .btn {
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-          justify-content: space-between;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
+  justify-content: space-between;
+  align-items: center;
   margin-top: 20rpx;
 }
 page .content .box .amount .btn view {
@@ -212,15 +191,9 @@ page .content .box .amount .btn .selected {
   color: #fff;
 }
 page .content .box .tip {
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-          justify-content: center;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
+  justify-content: center;
+  align-items: center;
   height: 60rpx;
   margin-top: 20rpx;
 }
@@ -295,16 +268,9 @@ page .more-gun .gun-list scroll-view view {
   background: rgba(255, 255, 255, 0.08);
   box-shadow: 0px 2rpx 9rpx 4rpx rgba(16, 178, 125, 0.1);
   border-radius: 12rpx;
-  display: -webkit-inline-box;
-  display: -webkit-inline-flex;
   display: inline-flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-          flex-direction: column;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-          justify-content: center;
+  flex-direction: column;
+  justify-content: center;
   text-align: center;
   margin: 5rpx 15rpx 40rpx 15rpx;
 }

unpackage/dist/dev/mp-alipay/pages/list/list.acss

@@ -0,0 +1,191 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+page .list {
+  padding: 30rpx;
+  background: #F6F6F6;
+  height: 100vh;
+}
+page .list .search {
+  width: 690rpx;
+  height: 80rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 2rpx 9rpx 4rpx rgba(99, 99, 99, 0.1);
+  border-radius: 40rpx;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  align-items: center;
+}
+page .list .search .dist_search {
+  height: 80rpx;
+  max-width: 130rpx;
+  white-space: nowrap;
+  display: flex;
+  margin-left: 20rpx;
+}
+page .list .search .dist_search .district {
+  height: 80rpx;
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #111111;
+  line-height: 80rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  max-width: 110rpx;
+}
+page .list .search .dist_search > .icon {
+  background: url(/static/icon/1_b01_down.2x.png) no-repeat 0px 0px;
+  background-size: 100% 100%;
+  width: 13rpx;
+  height: 8rpx;
+  line-height: 80rpx;
+  margin-top: 38rpx;
+  margin-left: 10rpx;
+}
+page .list .search .separate {
+  width: 0rpx;
+  height: 35rpx;
+  border: 1rpx solid #CCCCCC;
+  box-sizing: border-box;
+}
+page .list .search .inp {
+  width: 450rpx;
+  height: 80rpx;
+}
+page .list .search .inp .icon {
+  display: inline-block;
+  background: url(/static/icon/1_b01_search.2x.png) no-repeat 0px 0px;
+  background-size: 100% 100%;
+  width: 26rpx;
+  height: 26rpx;
+  margin-bottom: 25rpx;
+}
+page .list .search .inp > input {
+  display: inline-block;
+  margin-left: 20rpx;
+  width: 310rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  background: none;
+  outline: none;
+  border: none;
+}
+page .list .postion {
+  margin: 30rpx 30rpx 0 30rpx;
+}
+page .list .postion .icon {
+  background: url(/static/icon/1_b01_location.2x.png) no-repeat 0px 0px;
+  background-size: 100% 100%;
+  width: 33rpx;
+  height: 35rpx;
+  display: inline-block;
+}
+page .list .postion .current {
+  margin-left: 20rpx;
+  display: inline-block;
+  height: 40rpx;
+  font-size: 28rpx;
+  color: #868686;
+  line-height: 40rpx;
+  max-width: 550rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+page .list .postion .refresh {
+  background: url(/static/icon/icon_shuaxin.2x.png) no-repeat 0px 0px;
+  background-size: 100% 100%;
+  margin-top: 5rpx;
+  width: 27rpx;
+  height: 27rpx;
+  float: right;
+}
+page .list .collection {
+  margin-top: 30rpx;
+}
+page .list .collection .station {
+  margin-bottom: 30rpx;
+  padding: 40rpx;
+  width: 690rpx;
+  height: 285rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 2rpx 9rpx 4rpx rgba(99, 99, 99, 0.1);
+  border-radius: 18rpx;
+  box-sizing: border-box;
+}
+page .list .collection .station .content {
+  display: flex;
+}
+page .list .collection .station .content > image {
+  width: 155rpx;
+  height: 155rpx;
+  display: inline-block;
+}
+page .list .collection .station .content .detail {
+  margin-left: 20rpx;
+  width: 450rpx;
+  height: 155rpx;
+  display: inline-block;
+}
+page .list .collection .station .content .detail .name {
+  height: 45rpx;
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #111111;
+  line-height: 45rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+page .list .collection .station .footer {
+  margin-top: 40rpx;
+  display: flex;
+  justify-content: space-around;
+}
+page .list .collection .station .footer .gothere {
+  height: 40rpx;
+  width: 250rpx;
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #6c6c6c;
+  line-height: 40rpx;
+  text-align: center;
+}
+page .list .collection .station .footer .separator {
+  color: #CCCCCC;
+}
+page .list .collection .station .footer .gobuy {
+  height: 40rpx;
+  font-size: 28rpx;
+  font-weight: bold;
+  width: 250rpx;
+  color: #F3B235;
+  line-height: 40rpx;
+  text-align: center;
+}
+

unpackage/dist/dev/mp-alipay/pages/list/list.json

@@ -0,0 +1,5 @@
+{
+  "defaultTitle": "油站列表",
+  "pullRefresh": false,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-alipay/pages/skip/skip.acss

@@ -0,0 +1,49 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+page .skip {
+  position: relative;
+}
+page .skip .bg {
+  background: url(/static/icon/goto.png) no-repeat 0px 0px;
+  background-size: 100% 100%;
+  width: 182rpx;
+  height: 216rpx;
+  position: absolute;
+  top: 238rpx;
+  left: 270rpx;
+}
+page .skip .text {
+  font-size: 40rpx;
+  width: 750rpx;
+  text-align: center;
+  font-weight: 550;
+  color: #000000;
+  line-height: 56rpx;
+  position: absolute;
+  top: 522rpx;
+}
+

unpackage/dist/dev/mp-alipay/pages/skip/skip.axml

@@ -0,0 +1 @@
+<view class="skip"><view class="bg"></view><view class="text">{{''+tip+''}}</view></view>

unpackage/dist/dev/mp-alipay/pages/skip/skip.json

@@ -0,0 +1,5 @@
+{
+  "defaultTitle": "跳转中",
+  "pullRefresh": false,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-alipay/pages/succeed/succeed.acss

@@ -25,37 +25,396 @@
 /* 透明度 */
 /* 文章场景相关 */
 page {
-  width: 100vw;
-  height: 100vh;
+  width: 750rpx;
+  background: #F2F2F2;
 }
-page .succeed {
-  text-align: center;
+page .succeed .bg {
+  width: 750rpx;
+  height: 352rpx;
+  background: #0ca674;
+}
+page .succeed .bg .bg_con {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200rpx;
+}
+page .succeed .bg .bg_con .icon {
+  background: url(/static/icon/duigouxiao.2x.png) no-repeat 0px 0px;
+  background-size: 100% 100%;
+  width: 100rpx;
+  height: 100rpx;
+  display: inline-block;
+  margin-right: 30rpx;
 }
-page .succeed .icon {
-  margin-top: 300rpx;
+page .succeed .bg .bg_con .text {
+  font-size: 40rpx;
+  font-weight: bolder;
+  font-weight: 600;
+  color: #FFFFFF;
+  line-height: 56rpx;
   display: inline-block;
-  width: 181rpx;
-  height: 181rpx;
-  background: url(/static/icon/cg.2x.png) no-repeat 0px 0px;
+}
+page .succeed .container {
+  width: 690rpx;
+  margin: 0 auto;
+  margin-top: -150rpx;
+}
+page .succeed .container .voucher {
+  margin: 0;
+  width: 690rpx;
+  height: 635rpx;
+  border-radius: 14rpx;
+  box-sizing: border-box;
+  padding: 23rpx;
+  background: url(/static/icon/bg-success.png) no-repeat 0px 0px;
+  background-size: 100% 100%;
+}
+page .succeed .container .voucher .title {
+  height: 44rpx;
+  font-size: 38rpx;
+  font-weight: bolder;
+  color: #1C1C27;
+  line-height: 44rpx;
+  text-align: center;
+  margin-top: 35rpx;
+}
+page .succeed .container .voucher .tip {
+  height: 34rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: bold;
+  color: #F63932;
+  line-height: 34rpx;
+  text-align: center;
+  margin-top: 30rpx;
+}
+page .succeed .container .voucher .dashed {
+  width: 500rpx;
+  border: 2rpx dashed #c0c0c0;
+  margin: 30rpx auto 0 auto;
+}
+page .succeed .container .voucher .content {
+  height: 330rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin: 40rpx 80rpx 0 80rpx;
+}
+page .succeed .container .voucher .content > view {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+page .succeed .container .voucher .content > view text:nth-child(1) {
+  font-size: 33rpx;
+  font-weight: bold;
+  color: #1C1C27;
+  line-height: 40rpx;
+}
+page .succeed .container .voucher .content > view text:nth-child(2) {
+  font-size: 33rpx;
+  font-weight: bold;
+  color: rgba(0, 0, 0, 0.5);
+  line-height: 40rpx;
+  color: #9f9f9f;
+}
+page .succeed .container .attention .focus {
+  color: #c4c4c4;
+  font-size: 25rpx;
+  text-align: center;
+  margin-top: 50rpx;
+  margin-bottom: 10rpx;
+}
+page uni-popup.coupon .coupon-container {
+  width: 100%;
+  border-radius: 42rpx 42rpx 0px 0px;
+  background: #F2F2F2;
+  padding: 0 30rpx;
+  box-sizing: border-box;
+  position: relative;
+}
+page uni-popup.coupon .coupon-container .close {
+  width: 38rpx;
+  height: 38rpx;
+  position: absolute;
+  top: 24rpx;
+  right: 24rpx;
+  background: url(/static/icon/6_d05_close.2x.png) no-repeat 0px 0px;
   background-size: 100% 100%;
 }
-page .succeed .text {
-  margin-top: 20rpx;
-  font-size: 34rpx;
+page uni-popup.coupon .coupon-container > .title {
+  height: 105rpx;
+  font-size: 32rpx;
+  font-weight: 400;
+  color: #111111;
+  line-height: 105rpx;
   font-weight: 600;
+  color: #111111;
+  text-align: center;
 }
-page .succeed .focus {
-  margin-top: 100rpx;
-  display: inline-block;
-  font-weight: 500;
+page uni-popup.coupon .coupon-container .coupon-scroll {
+  max-height: 80vh;
+  overflow: scroll;
+  min-height: 50vh;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .top {
+  color: #007AFF;
+  width: 690rpx;
+  height: 140rpx;
+  padding: 0 30rpx 0 30rpx;
+  box-sizing: border-box;
+  background: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 50rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .top .top_left > .title {
   height: 40rpx;
   font-size: 28rpx;
-  color: #c4c4c4;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: bold;
+  color: rgba(0, 0, 0, 0.5);
   line-height: 40rpx;
+  letter-spacing: 1px;
+  margin-top: 30rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .top .top_left > .tip {
+  height: 28rpx;
+  font-size: 20rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 600;
+  color: #ff5c5a;
+  line-height: 28rpx;
+  margin-top: 10rpx;
 }
-page .succeed .official {
+page uni-popup.coupon .coupon-container .coupon-scroll .top .top_left > .tip > .icon {
+  background: url(/static/icon/tishi.2x.png) no-repeat;
+  background-size: 100% 100%;
   display: inline-block;
-  width: 700rpx;
-  text-align: left;
+  width: 22rpx;
+  height: 21rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .top .top_right {
+  width: 190rpx;
+  margin-top: 38rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .top .top_right > button {
+  text-align: center;
+  width: 190rpx;
+  height: 60rpx;
+  background: #23a97d;
+  border-radius: 30rpx;
+  outline: none;
+  border: none;
+  font-weight: 600;
+  color: #ffffff;
+  font-size: 26rpx;
+  letter-spacing: 1px;
+  line-height: 60rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon {
+  display: flex;
+  justify-content: space-between;
+  height: 200rpx;
+  margin-bottom: 30rpx;
+  box-shadow: 0rpx 0rpx 10rpx 4rpx rgba(233, 223, 223, 0.5);
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .left {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  text-align: center;
+  width: 220rpx;
+  height: 200rpx;
+  text-align: center;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .left .amount {
+  display: block;
+  font-size: 40rpx;
+  font-weight: 500;
+  color: #ffffff;
+  line-height: 56rpx;
+  text-align: center;
+  margin-top: 0rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .left .amount .value {
+  font-size: 60rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .left .condition {
+  font-size: 24rpx;
+  font-weight: 400;
+  color: #ffffff;
+  line-height: 33rpx;
+  text-align: center;
+  margin-top: 25rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .left .exchangeName {
+  display: none;
+  font-size: 35rpx;
+  font-weight: 500;
+  color: #ffffff;
+  line-height: 56rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .right {
+  width: 456rpx;
+  height: 200rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin: 8rpx 0 5rpx 0;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .right .title {
+  height: 30rpx;
+  font-size: 24rpx;
+  font-weight: 600;
+  line-height: 30rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .right .title .type {
+  width: 113rpx;
+  height: 30rpx;
+  line-height: 30rpx;
+  display: inline-block;
+  background: #f8c;
+  border-radius: 19rpx;
+  font-size: 24rpx;
+  font-weight: 600;
+  color: #ffffff;
+  text-align: center;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .right .title .state {
+  display: inline-block;
+  margin-left: 20rpx;
+  color: #7f7f7f;
+  height: 30rpx;
+  font-size: 24rpx;
+  font-weight: 600;
+  line-height: 33rpx;
+  white-space: nowrap;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .right .content {
+  display: flex;
+  justify-content: space-between;
+  margin: 5rpx 0 5rpx 0;
+  height: 100rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .right .content .items {
+  width: 330rpx;
+  height: 100%;
+  display: flex;
+  justify-content: space-around;
+  flex-direction: column;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .right .content .items .item {
+  color: #272626;
+  font-size: 21rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .right .content .items .item > text {
+  width: 230rpx;
+  display: inline-block;
+  color: #272626;
+  font-size: 22rpx;
+  font-weight: bold;
+  overflow: hidden;
+  /* 超出部分隐藏 */
+  white-space: nowrap;
+  /* 文本不换行 */
+  text-overflow: ellipsis;
+  /* 省略的文本用省略号表示 */
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .right .content .items .from {
+  display: none;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .right .content > .btn {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  margin-right: 10rpx;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .right .content > .btn > button {
+  height: 60rpx;
+  background: linear-gradient(143deg, #fad965 0%, #f3b235 100%);
+  border-radius: 20rpx;
+  border: none;
+  outline: none;
+  color: #ffffff;
+  line-height: 60rpx;
+  font-size: 30rpx;
+  font-weight: 400;
+  overflow: hidden;
+  /* 超出部分隐藏 */
+  white-space: nowrap;
+  /* 文本不换行 */
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .coupon > .right .tip {
+  margin-right: 20rpx;
+  border-top: 2rpx dashed #d8d8d8;
+  height: 49rpx;
+  font-size: 22rpx;
+  font-weight: 400;
+  color: #7f7f7f;
+  line-height: 23rpx;
+  padding-top: 12rpx;
+  box-sizing: border-box;
+  overflow: scroll;
+  /* 超出部分隐藏 */
+  white-space: nowrap;
+  /*  text-overflow: ellipsis;*/
+  overflow: hidden;
+  /* 超出部分隐藏 */
+  white-space: nowrap;
+  /* 文本不换行 */
+  text-overflow: ellipsis;
+  /* 省略的文本用省略号表示 */
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .direct > .left {
+  background: url(/static/icon/quan1.2x.png) no-repeat;
+  background-size: 100% 100%;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .direct > .right > .title > .type {
+  background: #f8ce57;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .direct > .right > .content > .btn button {
+  background: linear-gradient(143deg, #fad965 0%, #f3b235 100%);
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .rate > .left {
+  background: url(/static/icon/quan2.2x.png) no-repeat;
+  background-size: 100% 100%;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .rate > .right > .title > .type {
+  background: #eb8573;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .rate > .right > .content > .btn button {
+  background: linear-gradient(143deg, #f4a796 0%, #e67462 100%);
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .exchange > .left {
+  background: url(/static/icon/quan3.2x.png) no-repeat;
+  background-size: 100% 100%;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .exchange > .left > .amount,
+page uni-popup.coupon .coupon-container .coupon-scroll .center .exchange > .left > .condition {
+  display: none;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .exchange > .left > .exchangeName {
+  display: inline-block;
+  width: 150rpx;
+  margin: 0 auto;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .exchange > .right > .title > .type {
+  background: #19c79b;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .exchange > .right > .content > .btn button {
+  background: linear-gradient(143deg, #21d9b4 0%, #0fb582 100%);
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .expired > .left {
+  background-position: center;
+  /** 居中*/
+  background: url(/static/icon/quan.png) no-repeat;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .expired > .right > .title > .type {
+  background: #bfbfbf;
+}
+page uni-popup.coupon .coupon-container .coupon-scroll .center .expired > .right > .content > .btn button {
+  display: none;
 }
 

unpackage/dist/dev/mp-alipay/pages/succeed/succeed.json

@@ -1,5 +1,7 @@
 {
   "defaultTitle": "支付成功",
   "pullRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
+  }
 }

unpackage/dist/dev/mp-alipay/pages/test/test.axml

@@ -1 +1 @@
-<view class="content"><button data-event-opts="{{[['tap',[['open',['$event']]]]]}}" onTap="__e">打开弹窗</button></view>
+<view><view class="uni-title uni-common-pl">地区选择器</view><view class="uni-list"><view class="uni-list-cell"><view class="uni-list-cell-left">当前选择</view><view class="uni-list-cell-db"><picker value="{{index}}" range="{{array}}" data-event-opts="{{[['change',[['bindPickerChange',['$event']]]]]}}" onChange="__e"><view class="uni-input">{{array[index]}}</view></picker></view></view></view><view class="uni-title uni-common-pl">时间选择器</view><view class="uni-list"><view class="uni-list-cell"><view class="uni-list-cell-left">当前选择</view><view class="uni-list-cell-db"><picker mode="time" value="{{time}}" start="09:01" end="21:01" data-event-opts="{{[['change',[['bindTimeChange',['$event']]]]]}}" onChange="__e"><view class="uni-input">{{time}}</view></picker></view></view></view><view class="uni-title uni-common-pl">日期选择器</view><view class="uni-list"><view class="uni-list-cell"><view class="uni-list-cell-left">当前选择</view><view class="uni-list-cell-db"><picker mode="date" value="{{date}}" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" onChange="__e"><view class="uni-input">{{date}}</view></picker></view></view></view></view>

unpackage/dist/dev/mp-alipay/uni_modules/uni-icons/components/uni-icons/uni-icons.axml

@@ -1 +1 @@
-<text data-event-opts="{{[['tap',[['_onClick',['$event']]]]]}}" class="{{((('uni-icons data-v-a2e81f6e')+' '+customIcons)+' '+(customIcons?type:''))}}" style="{{'color:'+(color)+';'+('font-size:'+(size+'px')+';')}}" onTap="__e">{{icons[type]}}</text>
+<text data-event-opts="{{[['tap',[['_onClick',['$event']]]]]}}" class="{{(((('uni-icons')+' '+'data-v-a2e81f6e')+' '+customIcons)+' '+(customIcons?type:''))}}" style="{{'color:'+(color)+';'+('font-size:'+(size+'px')+';')}}" onTap="__e">{{icons[type]}}</text>

unpackage/dist/dev/mp-alipay/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.acss

@@ -25,18 +25,11 @@
 /* 透明度 */
 /* 文章场景相关 */
 .uni-noticebar.data-v-a1596656 {
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
   width: 100%;
   box-sizing: border-box;
-  -webkit-box-orient: horizontal;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: row;
-          flex-direction: row;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
+  flex-direction: row;
+  align-items: center;
   padding: 6px 12px;
   margin-bottom: 10px;
 }
@@ -47,13 +40,8 @@
   margin-right: 5px;
 }
 .uni-noticebar__content-wrapper.data-v-a1596656 {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-          flex-direction: column;
+  flex: 1;
+  flex-direction: column;
   overflow: hidden;
 }
 .uni-noticebar__content-wrapper--single.data-v-a1596656 {
@@ -61,33 +49,22 @@
 }
 .uni-noticebar__content-wrapper--single.data-v-a1596656,
 .uni-noticebar__content-wrapper--scrollable.data-v-a1596656 {
-  -webkit-box-orient: horizontal;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: row;
-          flex-direction: row;
+  flex-direction: row;
 }
 .uni-noticebar__content-wrapper--scrollable.data-v-a1596656 {
   position: relative;
   height: 18px;
 }
 .uni-noticebar__content--scrollable.data-v-a1596656 {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
+  flex: 1;
   display: block;
   overflow: hidden;
 }
 .uni-noticebar__content--single.data-v-a1596656 {
-  display: -webkit-box;
-  display: -webkit-flex;
   display: flex;
-  -webkit-box-flex: 0;
-  -webkit-flex: none;
-          flex: none;
+  flex: none;
   width: 100%;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-          justify-content: center;
+  justify-content: center;
 }
 .uni-noticebar__content-text.data-v-a1596656 {
   font-size: 14px;
@@ -114,18 +91,10 @@
           animation-play-state: paused;
 }
 .uni-noticebar__more.data-v-a1596656 {
-  display: -webkit-inline-box;
-  display: -webkit-inline-flex;
   display: inline-flex;
-  -webkit-box-orient: horizontal;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: row;
-          flex-direction: row;
-  -webkit-flex-wrap: nowrap;
-          flex-wrap: nowrap;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-          align-items: center;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
   padding-left: 5px;
 }
 .uni-noticebar__more-text.data-v-a1596656 {

unpackage/dist/dev/mp-alipay/uni_modules/uni-popup/components/uni-popup/uni-popup.acss

@@ -41,10 +41,8 @@
   opacity: 0;
 }
 .mask-ani.data-v-7c43d41b {
-  -webkit-transition-property: opacity;
   transition-property: opacity;
-  -webkit-transition-duration: 0.2s;
-          transition-duration: 0.2s;
+  transition-duration: 0.2s;
 }
 .uni-top-mask.data-v-7c43d41b {
   opacity: 1;
@@ -76,12 +74,10 @@
   padding-bottom: env(safe-area-inset-bottom);
 }
 .content-ani.data-v-7c43d41b {
-  -webkit-transition-property: opacity, -webkit-transform;
   transition-property: opacity, -webkit-transform;
   transition-property: transform, opacity;
   transition-property: transform, opacity, -webkit-transform;
-  -webkit-transition-duration: 0.2s;
-          transition-duration: 0.2s;
+  transition-duration: 0.2s;
 }
 .uni-top-content.data-v-7c43d41b {
   -webkit-transform: translateY(0);

unpackage/dist/dev/mp-alipay/uni_modules/uni-popup/components/uni-popup/uni-popup.axml

@@ -1 +1 @@
-<block a:if="{{showPopup}}"><view data-event-opts="{{[['touchMove',[['clear',['$event']]]]]}}" class="{{((('uni-popup data-v-7c43d41b')+' '+popupstyle)+' '+(isDesktop?'fixforpc-z-index':''))}}" catchTouchMove="__e"><block a:if="{{maskShow}}"><uni-transition class="uni-mask--hook data-v-7c43d41b" vue-id="0c2d3021-1" mode-class="{{['fade']}}" styles="{{maskClass}}" duration="{{duration}}" show="{{showTrans}}" data-event-opts="{{[['^click',[['onTap']]]]}}" onClick="__e" onVueInit="__l"></uni-transition></block><uni-transition vue-id="0c2d3021-2" mode-class="{{ani}}" styles="{{transClass}}" duration="{{duration}}" show="{{showTrans}}" data-event-opts="{{[['^click',[['onTap']]]]}}" onClick="__e" class="data-v-7c43d41b" onVueInit="__l"><view data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" class="uni-popup__wrapper-box data-v-7c43d41b" catchTap="__e"><slot></slot></view></uni-transition></view></block>
+<block a:if="{{showPopup}}"><view data-event-opts="{{[['touchMove',[['clear',['$event']]]]]}}" class="{{(((('uni-popup')+' '+'data-v-7c43d41b')+' '+popupstyle)+' '+(isDesktop?'fixforpc-z-index':''))}}" catchTouchMove="__e"><block a:if="{{maskShow}}"><uni-transition class="uni-mask--hook data-v-7c43d41b" vue-id="0c2d3021-1" mode-class="{{['fade']}}" styles="{{maskClass}}" duration="{{duration}}" show="{{showTrans}}" data-event-opts="{{[['^click',[['onTap']]]]}}" onClick="__e" onVueInit="__l"></uni-transition></block><uni-transition vue-id="0c2d3021-2" mode-class="{{ani}}" styles="{{transClass}}" duration="{{duration}}" show="{{showTrans}}" data-event-opts="{{[['^click',[['onTap']]]]}}" onClick="__e" class="data-v-7c43d41b" onVueInit="__l"><view data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" class="uni-popup__wrapper-box data-v-7c43d41b" catchTap="__e"><slot></slot></view></uni-transition></view></block>

unpackage/dist/dev/mp-alipay/uni_modules/uni-transition/components/uni-transition/uni-transition.acss

@@ -1,10 +1,7 @@
 
 .uni-transition {
-	-webkit-transition-timing-function: ease;
-	        transition-timing-function: ease;
-	-webkit-transition-duration: 0.3s;
-	        transition-duration: 0.3s;
-	-webkit-transition-property: opacity, -webkit-transform;
+	transition-timing-function: ease;
+	transition-duration: 0.3s;
 	transition-property: opacity, -webkit-transform;
 	transition-property: transform, opacity;
 	transition-property: transform, opacity, -webkit-transform;

unpackage/dist/dev/mp-alipay/uni_modules/uni-transition/components/uni-transition/uni-transition.js

@@ -1,25 +1,115 @@
 ;my.defineComponent || (my.defineComponent = Component);(my["webpackJsonp"] = my["webpackJsonp"] || []).push([["uni_modules/uni-transition/components/uni-transition/uni-transition"],{
 
-/***/ 100:
-/*!******************************************************************************************************************************************************!*\
-  !*** C:/Users/first/Documents/HBuilderProjects/小程序/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=script&lang=js& ***!
-  \******************************************************************************************************************************************************/
+/***/ 119:
+/*!*****************************************************************************************************************!*\
+  !*** C:/Users/first/Desktop/公司/applets/uni_modules/uni-transition/components/uni-transition/uni-transition.vue ***!
+  \*****************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-transition.vue?vue&type=script&lang=js& */ 101);
+/* harmony import */ var _uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./uni-transition.vue?vue&type=template&id=6369f8c4& */ 120);
+/* harmony import */ var _uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-transition.vue?vue&type=script&lang=js& */ 122);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony import */ var _uni_transition_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-transition.vue?vue&type=style&index=0&lang=css& */ 124);
+/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 15);
+
+var renderjs
+
+
+
+
+
+/* normalize component */
+
+var component = Object(_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__["default"])(
+  _uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
+  _uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["render"],
+  _uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
+  false,
+  null,
+  null,
+  null,
+  false,
+  _uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["components"],
+  renderjs
+)
+
+component.options.__file = "uni_modules/uni-transition/components/uni-transition/uni-transition.vue"
+/* harmony default export */ __webpack_exports__["default"] = (component.exports);
+
+/***/ }),
+
+/***/ 120:
+/*!************************************************************************************************************************************************!*\
+  !*** C:/Users/first/Desktop/公司/applets/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=template&id=6369f8c4& ***!
+  \************************************************************************************************************************************************/
+/*! exports provided: render, staticRenderFns, recyclableRender, components */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-transition.vue?vue&type=template&id=6369f8c4& */ 121);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+
+
+
+/***/ }),
+
+/***/ 121:
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./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--16-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!C:/Users/first/Desktop/公司/applets/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=template&id=6369f8c4& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*! exports provided: render, staticRenderFns, recyclableRender, components */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "render", function() { return render; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
+var components
+var render = function() {
+  var _vm = this
+  var _h = _vm.$createElement
+  var _c = _vm._self._c || _h
+}
+var recyclableRender = false
+var staticRenderFns = []
+render._withStripped = true
+
+
+
+/***/ }),
+
+/***/ 122:
+/*!******************************************************************************************************************************************!*\
+  !*** C:/Users/first/Desktop/公司/applets/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=script&lang=js& ***!
+  \******************************************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-transition.vue?vue&type=script&lang=js& */ 123);
 /* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 101:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-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!C:/Users/first/Documents/HBuilderProjects/小程序/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=script&lang=js& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/***/ 123:
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-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!C:/Users/first/Desktop/公司/applets/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=script&lang=js& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -240,26 +330,26 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 /***/ }),
 
-/***/ 102:
-/*!**************************************************************************************************************************************************************!*\
-  !*** C:/Users/first/Documents/HBuilderProjects/小程序/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=style&index=0&lang=css& ***!
-  \**************************************************************************************************************************************************************/
+/***/ 124:
+/*!**************************************************************************************************************************************************!*\
+  !*** C:/Users/first/Desktop/公司/applets/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=style&index=0&lang=css& ***!
+  \**************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-transition.vue?vue&type=style&index=0&lang=css& */ 103);
+/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-transition.vue?vue&type=style&index=0&lang=css& */ 125);
 /* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 103:
-/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-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--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/first/Documents/HBuilderProjects/小程序/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=style&index=0&lang=css& ***!
-  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/***/ 125:
+/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-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--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/first/Desktop/公司/applets/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=style&index=0&lang=css& ***!
+  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -267,96 +357,6 @@ __webpack_require__.r(__webpack_exports__);
     if(false) { var cssReload; }
   
 
-/***/ }),
-
-/***/ 97:
-/*!*****************************************************************************************************************************!*\
-  !*** C:/Users/first/Documents/HBuilderProjects/小程序/uni_modules/uni-transition/components/uni-transition/uni-transition.vue ***!
-  \*****************************************************************************************************************************/
-/*! no static exports found */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./uni-transition.vue?vue&type=template&id=6369f8c4& */ 98);
-/* harmony import */ var _uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-transition.vue?vue&type=script&lang=js& */ 100);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _uni_transition_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-transition.vue?vue&type=style&index=0&lang=css& */ 102);
-/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 14);
-
-var renderjs
-
-
-
-
-
-/* normalize component */
-
-var component = Object(_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__["default"])(
-  _uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
-  _uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["render"],
-  _uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
-  false,
-  null,
-  null,
-  null,
-  false,
-  _uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["components"],
-  renderjs
-)
-
-component.options.__file = "uni_modules/uni-transition/components/uni-transition/uni-transition.vue"
-/* harmony default export */ __webpack_exports__["default"] = (component.exports);
-
-/***/ }),
-
-/***/ 98:
-/*!************************************************************************************************************************************************************!*\
-  !*** C:/Users/first/Documents/HBuilderProjects/小程序/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=template&id=6369f8c4& ***!
-  \************************************************************************************************************************************************************/
-/*! exports provided: render, staticRenderFns, recyclableRender, components */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-transition.vue?vue&type=template&id=6369f8c4& */ 99);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["render"]; });
-
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
-
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
-
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["components"]; });
-
-
-
-/***/ }),
-
-/***/ 99:
-/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./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--16-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!C:/Users/first/Documents/HBuilderProjects/小程序/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=template&id=6369f8c4& ***!
-  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-/*! exports provided: render, staticRenderFns, recyclableRender, components */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "render", function() { return render; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
-var components
-var render = function() {
-  var _vm = this
-  var _h = _vm.$createElement
-  var _c = _vm._self._c || _h
-}
-var recyclableRender = false
-var staticRenderFns = []
-render._withStripped = true
-
-
-
 /***/ })
 
 }]);
@@ -364,7 +364,7 @@ render._withStripped = true
     'uni_modules/uni-transition/components/uni-transition/uni-transition-create-component',
     {
         'uni_modules/uni-transition/components/uni-transition/uni-transition-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('1')['createComponent'](__webpack_require__(97))
+            __webpack_require__('1')['createComponent'](__webpack_require__(119))
         })
     },
     [['uni_modules/uni-transition/components/uni-transition/uni-transition-create-component']]

unpackage/dist/dev/mp-weixin/app.json

@@ -7,8 +7,7 @@
     "pages/authen/identity",
     "pages/authen/login",
     "pages/confirm/confirm",
-    "pages/skip/skip",
-    "pages/succeed1/succeed1"
+    "pages/skip/skip"
   ],
   "subPackages": [],
   "window": {
@@ -25,5 +24,6 @@
       "desc": "获取附近的油站"
     }
   },
-  "usingComponents": {}
+  "usingComponents": {},
+  "sitemapLocation": "sitemap.json"
 }

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

@@ -7,11 +7,11 @@
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(createApp) {__webpack_require__(/*! uni-pages */ 4);__webpack_require__(/*! @dcloudio/uni-stat */ 5);var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
-var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 9));
-var _store = _interopRequireDefault(__webpack_require__(/*! ./store */ 15));
+/* WEBPACK VAR INJECTION */(function(createApp) {__webpack_require__(/*! uni-pages */ 5);__webpack_require__(/*! @dcloudio/uni-stat */ 6);var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
+var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 10));
+var _store = _interopRequireDefault(__webpack_require__(/*! ./store */ 16));
 
-var _api = __webpack_require__(/*! ./util/api.js */ 21);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}
+var _api = __webpack_require__(/*! ./util/api.js */ 24);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}
 
 
 
@@ -65,7 +65,8 @@ createApp(app).$mount();
 /* 6 */,
 /* 7 */,
 /* 8 */,
-/* 9 */
+/* 9 */,
+/* 10 */
 /*!*************************************************!*\
   !*** C:/Users/first/Desktop/公司/applets/App.vue ***!
   \*************************************************/
@@ -74,10 +75,10 @@ createApp(app).$mount();
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./App.vue?vue&type=script&lang=js& */ 10);
+/* harmony import */ var _App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./App.vue?vue&type=script&lang=js& */ 11);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./App.vue?vue&type=style&index=0&lang=css& */ 12);
-/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 14);
+/* harmony import */ var _App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./App.vue?vue&type=style&index=0&lang=css& */ 13);
+/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 15);
 var render, staticRenderFns, recyclableRender, components
 var renderjs
 
@@ -104,7 +105,7 @@ component.options.__file = "App.vue"
 /* harmony default export */ __webpack_exports__["default"] = (component.exports);
 
 /***/ }),
-/* 10 */
+/* 11 */
 /*!**************************************************************************!*\
   !*** C:/Users/first/Desktop/公司/applets/App.vue?vue&type=script&lang=js& ***!
   \**************************************************************************/
@@ -113,13 +114,13 @@ component.options.__file = "App.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js& */ 11);
+/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js& */ 12);
 /* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
-/* 11 */
+/* 12 */
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-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!C:/Users/first/Desktop/公司/applets/App.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -148,8 +149,9 @@ WxUpdate = /*#__PURE__*/function () {function WxUpdate() {_classCallCheck(this,
         that.updateManager.onCheckForUpdate(function (res) {
           if (res.hasUpdate) {
             wx.showModal({
-              title: '更新提示',
+              title: '升级提示',
               content: '检测到新版本，是否下载新版本并重启小程序？',
+              showCancel: false,
               success: function success(res) {
                 if (res.confirm) {
                   that.downLoadAndUpdateApplet();
@@ -177,11 +179,19 @@ WxUpdate = /*#__PURE__*/function () {function WxUpdate() {_classCallCheck(this,
     } }, { key: "downLoadAndUpdateApplet", value: function downLoadAndUpdateApplet()
     {
       var that = this;
-      wx.showLoading();
-      that.updateManager.onUpdateReady(function () {
-        wx.hideLoading();
-        that.updateManager.applyUpdate();
-      });
+      wx.showModal({
+        title: '升级提示',
+        showCancel: false,
+        content: '如果小程序自动升级失败~请您手动删除当前小程序后，重新打开小程序~',
+        success: function success(res) {
+          wx.showLoading();
+          that.updateManager.onUpdateReady(function () {
+            wx.hideLoading();
+            that.updateManager.applyUpdate();
+          });
+        } });
+
+
       that.updateManager.onUpdateFailed(function () {
         wx.hideLoading();
         wx.showModal({
@@ -227,7 +237,7 @@ WxUpdate = /*#__PURE__*/function () {function WxUpdate() {_classCallCheck(this,
   } };exports.default = _default;
 
 /***/ }),
-/* 12 */
+/* 13 */
 /*!**********************************************************************************!*\
   !*** C:/Users/first/Desktop/公司/applets/App.vue?vue&type=style&index=0&lang=css& ***!
   \**********************************************************************************/
@@ -236,13 +246,13 @@ WxUpdate = /*#__PURE__*/function () {function WxUpdate() {_classCallCheck(this,
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=css& */ 13);
+/* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../GreenSoft/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=css& */ 14);
 /* harmony import */ var _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_GreenSoft_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
-/* 13 */
+/* 14 */
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-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--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!C:/Users/first/Desktop/公司/applets/App.vue?vue&type=style&index=0&lang=css& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/