John-Hong 2 년 전
부모
커밋
4887edbc5e

+ 126 - 86
src/App.vue

@@ -75,106 +75,146 @@ export default {
       CacheTool.init();
       if (this.isInit) return;
       this.isInit = false;
-      // 当前页面是否是在微信公众号运行:start
+
       const kipAccessToken = uni.getStorageSync('kipAccessToken');
       const query = getUrlParams();
-      console.log('h5登录时的参数', query);
+      // console.log('h5登录时的参数', query);
       const platform = getPlatform();
-      if (query.groupId && query.groupId !== 'undefined') {
-        this.$store.commit('SET_GROUP_ID', query.groupId);
+      if (
+        (query.groupId && query.groupId !== 'undefined') ||
+        uni.getStorageSync('mallId')
+      ) {
+        this.$store.commit(
+          'SET_GROUP_ID',
+          query?.groupId || uni.getStorageSync('groupId')
+        );
+      }
+      // 如果用户没有openid
+      const openid = uni.getStorageSync('openid');
+      // console.log(949494, openid);
+      // 设置openid
+      if (openid && openid !== 'undefined') {
+        this.$store.commit('SET_OPENID', openid);
+      }
+      if (!openid) {
+        // 当进入其他页面时,需要先打开路由展示
+        this.isInit = true;
+        // 前往授权页面
+        this.$router.replace({
+          path: '/openWx',
+          query: query,
+        });
+        return;
+      }
+      // console.log(85, platform);
+      if (
+        (query.mallId && query.mallId !== 'undefined') ||
+        uni.getStorageSync('mallId')
+      ) {
+        this.$store.commit(
+          'SET_MALL_ID',
+          query?.mallId?.replace('#/', '') || uni.getStorageSync('mallId')
+        );
       }
-      console.log(85, query.mallId);
-      if (query.mallId && query.mallId !== 'undefined') {
-        this.$store.commit('SET_MALL_ID', query.mallId.replace('#/', ''));
+      if (uni.getStorageSync('member')) {
+        this.$store.dispatch('getUserDetail');
+        this.$store.commit('SET_USER_INFO', uni.getStorageSync('member'));
+        this.$store.commit('SET_MEMBER', uni.getStorageSync('member'));
       }
-      // TODO true 需要取消
-      if (platform === 'micromessenger' && !kipAccessToken) {
+      // 当前页面是否是在微信公众号运行:start
+      // 微信公众号环境 start
+      if (platform === 'micromessenger') {
         // 如果用户没有登录的话,我们需要让用户完成授权拿到 openid
-        const openid = uni.getStorageSync('openid');
-        if (!openid) {
-          // 当进入其他页面时,需要先打开路由展示
+        /* const openid = uni.getStorageSync('openid');
+        // console.log(949494, openid);
+        // 设置openid
+        if (openid && openid !== 'undefined') {
+          this.$store.commit('SET_OPENID', openid);
+        } */
+        if (!kipAccessToken) {
+          /* if (!openid) {
+            // 当进入其他页面时,需要先打开路由展示
+            this.isInit = true;
+            // 前往授权页面
+            this.$router.replace({
+              path: '/openWx',
+              query: query,
+            });
+            return;
+          } */
+          // 初始化微信
+          initWxJsSdkConfig(['chooseWXPay']);
+          // 如果用户不选择登录,则不走登录逻辑
           this.isInit = true;
-          // 前往授权页面
           this.$router.replace({
-            path: '/openWx',
+            path: '/login',
             query: query,
           });
           return;
         }
-        // 初始化微信
-        initWxJsSdkConfig(['chooseWXPay']);
-        // 如果用户不选择登录,则不走登录逻辑
-        this.isInit = true;
-        this.$router.replace({
-          path: '/login',
-          query: query,
-        });
-        return;
-      }
-      this.isInit = true;
-      // 如果用已经登录
-      if (platform === 'micromessenger' && kipAccessToken) {
+        // 如果用已经登录
         // 验证 kipAccessToken 是否过期,过期则刷新
-        // kipCheckToken(kipAccessToken)
-        //   .then((resp) => {
-        //     if (resp && resp.statusCode == '401') {
-        //       log.info(
-        //         `access_token已过期,使用refresh_token刷新access_token,如果refresh_token过期则删除所有数据`
-        //       );
-        //       // token过期之后使用refresh_token刷新access_token,如果refresh_token过期则删除所有数据
-        //       const kipRefreshToken = KipCacheTool.getKipRefreshToken();
-        //       kipGetNewAccessTokenByRefreshToken(kipRefreshToken)
-        //         .then((result) => {
-        //           // const result = resp.data;
-        //           if (
-        //             result &&
-        //             result.code === '000000' &&
-        //             result.data.access_token
-        //           ) {
-        //             KipCacheTool.setKipToken(result.data.access_token);
-        //             log.info(
-        //               `refreshToken获取成功,这是新的token:`,
-        //               result.data.access_token
-        //             );
-        //           } else {
-        //             if (
-        //               result &&
-        //               result.code !== KIP_API_CODE.REFRESH_TOKEN_EXPIRED
-        //             ) {
-        //               uni.showToast({
-        //                 title: result.message,
-        //                 duration: 2000,
-        //                 icon: 'none',
-        //               });
-        //             }
-        //             console.warn('===>清除所有缓存1');
-        //             log.info(`清除所有缓存1`);
-        //             _this.cleanAll();
-        //             this.$router.replace({
-        //               path: '/login',
-        //               query: query,
-        //             });
-        //           }
-        //         })
-        //         .catch((err) => {
-        //           console.warn('===>清除所有缓存2');
-        //           log.info(`清除所有缓存2`);
-        //           _this.cleanAll();
-        //           this.$router.replace({
-        //             path: '/login',
-        //             query: query,
-        //           });
-        //         });
-        //     }
-        //   })
-        //   .catch((err) => {
-        //     console.error(err);
-        //     console.warn('===>清除所有缓存3');
-        //     log.info(`refresh_token获取失败,清除所有缓存3`, err);
-        //     // _this.cleanAll();
-        //   });
+        kipCheckToken(kipAccessToken)
+          .then((resp) => {
+            // console.log(120, resp);
+            if (resp && resp.statusCode == '401') {
+              log.info(
+                `access_token已过期,使用refresh_token刷新access_token,如果refresh_token过期则删除所有数据`
+              );
+              // token过期之后使用refresh_token刷新access_token,如果refresh_token过期则删除所有数据
+              const kipRefreshToken = KipCacheTool.getKipRefreshToken();
+              kipGetNewAccessTokenByRefreshToken(kipRefreshToken)
+                .then((result) => {
+                  // const result = resp.data;
+                  if (
+                    result &&
+                    result.code === '000000' &&
+                    result.data.access_token
+                  ) {
+                    KipCacheTool.setKipToken(result.data.access_token);
+                    log.info(
+                      `refreshToken获取成功,这是新的token:`,
+                      result.data.access_token
+                    );
+                  } else {
+                    if (
+                      result &&
+                      result.code !== KIP_API_CODE.REFRESH_TOKEN_EXPIRED
+                    ) {
+                      uni.showToast({
+                        title: result.message,
+                        duration: 2000,
+                        icon: 'none',
+                      });
+                    }
+                    console.warn('===>清除所有缓存1');
+                    log.info(`清除所有缓存1`);
+                    _this.cleanAll();
+                    this.$router.replace({
+                      path: '/login',
+                      query: query,
+                    });
+                  }
+                })
+                .catch((err) => {
+                  console.warn('===>清除所有缓存2');
+                  log.info(`清除所有缓存2`);
+                  _this.cleanAll();
+                  this.$router.replace({
+                    path: '/login',
+                    query: query,
+                  });
+                });
+            }
+          })
+          .catch((err) => {
+            console.error(err);
+            console.warn('===>清除所有缓存3');
+            log.info(`refresh_token获取失败,清除所有缓存3`, err);
+            // _this.cleanAll();
+          });
         this.$router.replace({
-          path: '',
+          path: '/home',
           query: query,
         });
         this.isInit = true;

+ 3 - 4
src/pages/login/openWx.vue

@@ -19,10 +19,9 @@ export default {
   methods: {
     getCode() {
       const code = getUrlParams()?.code; // 截取路径中的code,如果没有就去微信授权,如果已经获取到了就直接传code给后台获取openId
-      console.log(17);
-      const local = window.location.href;
+      const local = window.location.origin;
+      // return
       if (code == null || code === '') {
-        console.log(120);
         window.location.href =
           'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +
           //   window.APPID +
@@ -48,7 +47,7 @@ export default {
       if ( res?.expires_in && res?.openid ) {
         this.$store.commit('SET_OPENID', res.openid)
         this.$router.replace({
-          path: '/'
+          path: '/home'
         })
       }
       //   this.$http

+ 4 - 4
src/pages/parkingFee/parkingFee.vue

@@ -284,7 +284,7 @@ export default {
         title: '临时停车',
       });
     }, 300);
-    console.log(286, this.openid);
+    // console.log(286, this.openid);
     // this.getParkInfo();
     if (this.openid) {
       // this.openId = this.openid;
@@ -383,9 +383,9 @@ export default {
         mallid: this.mallId,
         groupId: this.groupId,
         openid: openid,
-        // vipcode: app.globalData.member.vipcode
+        vipcode: this.member.vipcode
       };
-      console.log(342, params);
+      // console.log(342, params);
       this.$md(params);
       this.$request({
         url: this.$baseURL + 'api/1.0/park/parkInfo',
@@ -552,7 +552,7 @@ export default {
         timeout: 10000,
       })
         .then((res) => {
-          console.log(555555, res);
+          // console.log(555555, res);
           uni.hideLoading();
           if (res.data.code === 0) {
             this.$router.push({

+ 4 - 3
src/pages/parkingFee/parkingFeeDetail.vue

@@ -268,7 +268,7 @@ import log from '@/utils/log.js';
 import { compare } from '@/utils/location.js';
 import uni from '@/utils/uniHooks';
 import { initWxJsSdkConfig } from '@/utils/login';
-import { isInWeixinH5 } from '@/utils/index';
+import { isInWeixinH5, getPlatform } from '@/utils/index';
 
 export default {
   data() {
@@ -1753,7 +1753,7 @@ export default {
             //   }
             //   return;
             // }
-            console.log(17211721172117211721);
+            // console.log(17211721172117211721);
             if (this.actualFee > 0) {
               // 微信支付
               // console.log(1700, res);
@@ -1854,8 +1854,9 @@ export default {
           console.log(1795, res);
           if (res.data?.code == '000000') {
             const prepayJson = res.data.data.params;
+            const platform = getPlatform();
             // TODO: h5环境判断
-            if (isInWeixinH5() && false) {
+            if (platform === 'micromessenger') {
               const weixH5PayRes = await this.weixH5Pay(prepayJson);
               // 微信支付完成,判断结果
               console.log(1784, weixH5PayRes);

+ 1 - 1
src/pages/parkingFee/parkingFeeDiscounts.vue

@@ -190,7 +190,7 @@ export default {
       this.reduceHours =
         this.discountTotal.consumeFee / this.parkInfoEntity.needmoney || 0;
     }
-    const checkedList = uni.getStorageSync('checkedList');
+    const checkedList = JSON.parse(uni.getStorageSync('checkedList'));
     if (checkedList && checkedList.length) {
       this.checkedList = checkedList;
     } /* else {

+ 126 - 76
src/pages/parkingFee/parkingFeePaperCoupon.vue

@@ -2,21 +2,46 @@
   <scroll-view scroll-y="true" class="scroll-Y">
     <div class="worp">
       <div class="title">纸质优惠劵减免说明</div>
-      <div style="font-size: 28px;color:#808080;padding-top: 12px;">{{parkPaperCouponRemark}}</div>
+      <div style="font-size: 28px; color: #808080; padding-top: 12px">
+        {{ parkPaperCouponRemark }}
+      </div>
     </div>
     <template v-if="paperCouponList.length">
-      <div class="worp_index1" v-for="(item, index) in paperCouponList" :key="item.discountCode">
+      <div
+        class="worp_index1"
+        v-for="(item, index) in paperCouponList"
+        :key="item.discountCode"
+      >
         <div class="worp_index1_index">
-          <div class="content">劵码 {{item.discountCode}}</div>
+          <div class="content">劵码 {{ item.discountCode }}</div>
           <div @click="deleteCoupon(index)"><van-icon name="delete-o" /></div>
         </div>
-        <div style="padding-bottom: 25px;margin-left: 20px;margin-top: 20px;font-size: 28px;">优惠劵金额 :<span
-            style="color: #064C8A;">{{item.discountValueMoney | currency}}</span></div>
+        <div
+          style="
+            padding-bottom: 25px;
+            margin-left: 20px;
+            margin-top: 20px;
+            font-size: 28px;
+          "
+        >
+          优惠劵金额 :<span style="color: #064c8a">{{
+            item.discountValueMoney | currency
+          }}</span>
+        </div>
       </div>
     </template>
-    <div :class="{'worp_button': true, 'blue_flewx_index3': custTypeId === 1, 'green_flewx_index3': custTypeId === 2}"
-      @click="scanCode">
-      <img :src="require('./static/images/sweep.png')" style="width: 35px;height: 35px;margin-right: 20px;" />
+    <div
+      :class="{
+        worp_button: true,
+        blue_flewx_index3: custTypeId === 1,
+        green_flewx_index3: custTypeId === 2,
+      }"
+      @click="scanCode"
+    >
+      <img
+        :src="require('./static/images/sweep.png')"
+        style="width: 35px; height: 35px; margin-right: 20px"
+      />
       <div>扫码用劵</div>
     </div>
     <div class="flewx">
@@ -25,12 +50,22 @@
           currency}}元</span>
       </div> -->
       <div class="flewx-content">
-        已选<span class="num">{{paperCouponList.length}}张</span> <span class="discountFee">优惠券可优惠{{discountFee |
-          currency}}</span>
+        已选<span class="num">{{ paperCouponList.length }}张</span>
+        <span class="discountFee"
+          >优惠券可优惠{{ discountFee | currency }}</span
+        >
       </div>
       <div
-        :class="{'flewx_index3': true, 'blue_flewx_index3': custTypeId === 1, 'green_flewx_index3': custTypeId === 2, 'btn-disabled': !parkInfo.servicefee}"
-        @click="confirm">确定</div>
+        :class="{
+          flewx_index3: true,
+          blue_flewx_index3: custTypeId === 1,
+          green_flewx_index3: custTypeId === 2,
+          'btn-disabled': !parkInfo.servicefee,
+        }"
+        @click="confirm"
+      >
+        确定
+      </div>
     </div>
     <!-- 新的toast -->
     <fui-toast ref="toast"></fui-toast>
@@ -38,15 +73,15 @@
 </template>
 
 <script>
-import uni from '@/utils/uniHooks'
+import uni from '@/utils/uniHooks';
 // const app = getApp()
 const app = {};
 import { mapState } from 'vuex';
-import fuiToast from "@/components/fui-toast/fui-toast.vue";
+import fuiToast from '@/components/fui-toast/fui-toast.vue';
 
 export default {
   components: {
-    fuiToast
+    fuiToast,
   },
   created() {
     this.servicefee = uni.getStorageSync('servicefee'); // 应缴金额
@@ -55,15 +90,24 @@ export default {
       this.parkFee = JSON.parse(uni.getStorageSync('parkFee')); // discount接口返回的数据
       this.parkMallCode = this.parkFee.parkInfoEntity.parkMallCode;
       // 上限金额
-      this.maxonetimediscountFee = this.parkFee.parkInfoEntity.maxonetimediscount * this.parkFee.parkInfoEntity.needmoney;
-      this.maxonedaydiscountFee = (this.parkFee.parkInfoEntity.maxOneDayHour - this.parkFee.parkInfoEntity.ticketandMemeberGradeAndConsumeUseHour) * this.parkFee.parkInfoEntity.needmoney || 0;;
+      this.maxonetimediscountFee =
+        this.parkFee.parkInfoEntity.maxonetimediscount *
+        this.parkFee.parkInfoEntity.needmoney;
+      this.maxonedaydiscountFee =
+        (this.parkFee.parkInfoEntity.maxOneDayHour -
+          this.parkFee.parkInfoEntity.ticketandMemeberGradeAndConsumeUseHour) *
+          this.parkFee.parkInfoEntity.needmoney || 0;
       if (this.maxonedaydiscountFee < 0) {
         this.maxonedaydiscountFee = 0;
       }
 
       // 纸质优惠券说明
-      if (this.parkFee.parkPaperCouponsEntities && this.parkFee.parkPaperCouponsEntities[0]) {
-        this.parkPaperCouponRemark = this.parkFee.parkPaperCouponsEntities[0].remark;
+      if (
+        this.parkFee.parkPaperCouponsEntities &&
+        this.parkFee.parkPaperCouponsEntities[0]
+      ) {
+        this.parkPaperCouponRemark =
+          this.parkFee.parkPaperCouponsEntities[0].remark;
       }
     }
 
@@ -76,14 +120,12 @@ export default {
       this.paperDiscountTime = this.paperCouponInfo.paperDiscountTime;
       this.parkDiscountTotal.feeCopy -= this.paperCouponInfo.paperDiscountFee;
     }
-    this.paperCouponList = [
-      {
-        discountCode: '123456',
-        discountValueMoney: 10
-      }
-    ];
-
-
+    // this.paperCouponList = [
+    //   {
+    //     discountCode: '123456',
+    //     discountValueMoney: 10
+    //   }
+    // ];
   },
   data() {
     return {
@@ -98,12 +140,12 @@ export default {
       maxonetimediscountFee: 0, // 每次优惠上限金额
       maxonedaydiscountFee: 0, // 每天优惠上限金额
       parkMallCode: 1, // 0静安 1浦东 2杭州 3北京 4沈阳 5深圳
-      parkInfo: {}
-    }
+      parkInfo: {},
+    };
   },
   computed: {
     ...mapState({
-      custTypeId: state => state.custTypeId
+      custTypeId: (state) => state.custTypeId,
     }),
     // 实际支付金额
     actualFee() {
@@ -119,27 +161,31 @@ export default {
         }
       }
       if (this.parkMallCode === 4) {
-        if (this.parkDiscountTotal.feeCopy - this.parkDiscountTotal.bonusfee > this.maxonedaydiscountFee) {
-          this.parkDiscountTotal.feeCopy = this.maxonedaydiscountFee + this.parkDiscountTotal.bonusfee;
+        if (
+          this.parkDiscountTotal.feeCopy - this.parkDiscountTotal.bonusfee >
+          this.maxonedaydiscountFee
+        ) {
+          this.parkDiscountTotal.feeCopy =
+            this.maxonedaydiscountFee + this.parkDiscountTotal.bonusfee;
         }
       }
       return this.parkDiscountTotal.feeCopy + this.paperDiscountFee;
-    }
+    },
   },
   methods: {
     showToast(text) {
       let options = {};
       options.text = text;
-      this.$refs.toast.show(options)
+      this.$refs.toast.show(options);
     },
     // 扫码
     scanCode() {
       uni.scanCode({
         onlyFromCamera: false,
         scanType: ['qrCode'],
-        success: res => {
-          console.log('扫码', res)
-          if (res.scanType == "QR_CODE" && res.scanType) {
+        success: (res) => {
+          console.log('扫码', res);
+          if (res.scanType == 'QR_CODE' && res.scanType) {
             console.log(res.result);
             const url = res.result;
             if (url.indexOf('auth/') === -1) {
@@ -154,20 +200,20 @@ export default {
               }
             }
           }
-        }
-      })
+        },
+      });
     },
 
     // 根据卡券ID查询卡券信息
     getPaperCouponInfo(couponCode) {
       uni.showLoading({
-        title: '加载中'
+        title: '加载中',
       });
       const params = {
         groupId: app.globalData.groupId,
         mallid: app.globalData.mallid,
         couponcode: couponCode,
-        orderno: uni.getStorageSync('orderno')
+        orderno: uni.getStorageSync('orderno'),
       };
       this.$md(params);
       uni.request({
@@ -175,7 +221,7 @@ export default {
         data: params,
         method: 'POST',
         header: JSON.parse(uni.getStorageSync('handleUser')),
-        success: res => {
+        success: (res) => {
           uni.hideLoading();
           console.log(res);
           if (res.data.code !== 0) {
@@ -191,57 +237,64 @@ export default {
               return uni.showToast({
                 title: '该纸质优惠券未激活',
                 duration: 2000,
-                icon: 'none'
-              })
+                icon: 'none',
+              });
             }
             if (res.data.data.discountRuleId == '1') {
               return uni.showToast({
                 title: '该纸质优惠券已领取',
                 duration: 2000,
-                icon: 'none'
-              })
+                icon: 'none',
+              });
             }
             if (res.data.data.discountRuleId == '2') {
               return uni.showToast({
                 title: '该纸质优惠券已使用',
                 duration: 2000,
-                icon: 'none'
-              })
+                icon: 'none',
+              });
             }
             if (res.data.data.discountRuleId == '3') {
               return uni.showToast({
                 title: '该纸质优惠券已核销',
                 duration: 2000,
-                icon: 'none'
-              })
+                icon: 'none',
+              });
             }
           }
           if (this.paperCouponList.length) {
-            const index = this.paperCouponList.findIndex(e => e.discountCode === couponCode);
+            const index = this.paperCouponList.findIndex(
+              (e) => e.discountCode === couponCode
+            );
             if (index === -1) {
               this.paperCouponList.push(res.data.data);
               this.paperDiscountFee += Number(res.data.data.discountValueMoney);
-              this.paperDiscountTime = this.paperDiscountFee / this.parkFee.parkInfoEntity.needmoney;
+              this.paperDiscountTime =
+                this.paperDiscountFee / this.parkFee.parkInfoEntity.needmoney;
             }
           } else {
             this.paperCouponList.push(res.data.data);
             this.paperDiscountFee += Number(res.data.data.discountValueMoney);
-            this.paperDiscountTime = this.paperDiscountFee / this.parkFee.parkInfoEntity.needmoney;
+            this.paperDiscountTime =
+              this.paperDiscountFee / this.parkFee.parkInfoEntity.needmoney;
           }
 
           // this.crossMessage();
         },
-        fail: err => {
+        fail: (err) => {
           uni.hideLoading();
           console.log(err);
-        }
+        },
       });
     },
 
     // 删除
     deleteCoupon(i) {
-      this.paperDiscountFee -= Number(this.paperCouponList[i].discountValueMoney);
-      this.paperDiscountTime = this.paperDiscountFee / this.parkFee.parkInfoEntity.needmoney;
+      this.paperDiscountFee -= Number(
+        this.paperCouponList[i].discountValueMoney
+      );
+      this.paperDiscountTime =
+        this.paperDiscountFee / this.parkFee.parkInfoEntity.needmoney;
       this.paperCouponList.splice(i, 1);
     },
 
@@ -290,12 +343,12 @@ export default {
         paperDiscountFee: this.paperDiscountFee,
         paperDiscountTime: this.paperDiscountTime,
         paperCouponcode: paperCouponcode,
-        paperCouponList: this.paperCouponList
+        paperCouponList: this.paperCouponList,
       });
       this.$router.back();
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
@@ -306,7 +359,7 @@ export default {
   display: flex;
   flex-direction: column;
   height: 100vh;
-  background: #F4F7FF;
+  background: #f4f7ff;
 }
 
 .worp {
@@ -327,16 +380,16 @@ export default {
   margin-top: 30px;
   margin-left: 4%;
   font-size: 30px;
-  background: #FAFBFF;
+  background: #fafbff;
   border-radius: 4px;
-  border: 1px solid #D8DAE0;
+  border: 1px solid #d8dae0;
 }
 
 .worp_index1_index {
   width: 650px;
   height: 60px;
   margin-left: 20px;
-  border-bottom: 1px solid #F2F2F2;
+  border-bottom: 1px solid #f2f2f2;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -359,7 +412,7 @@ export default {
   color: #fff;
   margin-top: 45px;
   // background-image: linear-gradient(to right, #7e4fa1, #433c7f);
-  background: #064C8A;
+  background: #064c8a;
   margin-left: 30px;
   display: flex;
   align-items: center;
@@ -383,11 +436,11 @@ export default {
     position: absolute;
     left: 16px;
     font-size: 28px;
-    .num{
-      color: #064C8A;
+    .num {
+      color: #064c8a;
     }
-    .discountFee{
-      color: #EE4D3F;
+    .discountFee {
+      color: #ee4d3f;
     }
   }
 
@@ -400,7 +453,7 @@ export default {
     line-height: 70px;
     color: #fff;
     // background-image: linear-gradient(to right, #7e4fa1, #433c7f);
-    background: #064C8A;
+    background: #064c8a;
     box-shadow: 2px 3px 5px #888888;
     position: absolute;
     right: 16px;
@@ -408,11 +461,11 @@ export default {
 }
 
 .blue_flewx_index3 {
-  .color_flewx_index3('blue')
+  .color_flewx_index3('blue');
 }
 
 .green_flewx_index3 {
-  .color_flewx_index3('green')
+  .color_flewx_index3('green');
 }
 
 .color_flewx_index3(@value) {
@@ -421,6 +474,3 @@ export default {
   background-color: @@color !important;
 }
 </style>
-
-
-

+ 1 - 1
src/pages/parkingFee/parkingReceipt/parkingReceipt.vue

@@ -336,7 +336,7 @@ export default {
         page: this.page,
         pageSize: this.pagesize,
       };
-      console.log(273, data);
+      // console.log(273, data);
       // return;
 
       self.$md(data);

+ 1 - 1
src/plugins/install.js

@@ -86,7 +86,7 @@ Vue.prototype.$getLocationValue = getLocationValue;
 // Vue.prototype.$kipAppPath = '/pages/tabbar/home/home'
 
 const curEnvConst = CacheTool.getCurEnvConst();
-console.log(8989, curEnvConst.KIP_PAYMENT_URL)
+// console.log(8989, curEnvConst.KIP_PAYMENT_URL)
 Vue.prototype.$baseURL = curEnvConst.BASE_URL;
 Vue.prototype.$baseURLH5 = curEnvConst.BASE_URL_H5;
 Vue.prototype.$wsBaseURL = curEnvConst.WS_BASE_URL;

+ 1 - 1
src/utils/api-kip.js

@@ -93,7 +93,7 @@ export function kipCheckToken(token) {
 	if (!token) {
 		return;
 	}
-	console.log(848484, token)
+	// console.log(848484, token)
 	const url = `/oauth/v1/customer/users/checkToken?token=${token}`;
 	return request.get(url, null, { ...DEFAULT_CONFIG, noToken: true })
 }

+ 1 - 1
src/utils/cache-tool.js

@@ -23,7 +23,7 @@ export default {
 		this.setEnv('prod')
 	},
 	setEnv(env) {
-		console.log(2020202020, env)
+		// console.log(2020202020, env)
 		uni.setStorageSync("env", env);
 	},
 	getEnv() {

+ 1 - 1
src/utils/common.js

@@ -69,7 +69,7 @@ export function saveSceneQrcodeDetail(type, pageIndex, pageName, eventId, eventN
   // const app = getApp()
   // const app = {}
   let vipcode = ''
-  console.log(727272, uni.getStorageSync('member'))
+  // console.log(727272, uni.getStorageSync('member'))
   // #ifdef H5
   if (uni.getStorageSync('member') && uni.getStorageSync('member') !== '{}') {
     app.globalData.member = JSON.parse(uni.getStorageSync('member'))

+ 2 - 2
src/utils/request-kip.js

@@ -52,7 +52,7 @@ function getToken() {
 }
 
 function getUrl(path) {
-  console.log(555555555, path);
+  // console.log(555555555, path);
   // 如果是dev、qa、prod环境
   if (window.ininjectConfig) {
     if (path.indexOf('/profileApi') > -1) {
@@ -129,7 +129,7 @@ export default {
     }
     return new Promise((resolve, reject) => {
       const url = getUrl(/\/sns/.test(path) ? path : `/profileApi${path}`);
-      console.log(130, url);
+      // console.log(130, url);
       const { header } = handleConfig(config)
       log.info(`===>request-kip url: ${url}`)
       log.info(`===>request-kip header: ${JSON.stringify(header)}`)

+ 2 - 2
src/utils/uniHooks.js

@@ -89,7 +89,7 @@ function login({ title, success }) {
 }
 
 function request({ url, data, method, header, success, fail }) {
-  console.log(87878787, { url, data, method, header, success, fail });
+  // console.log(87878787, { url, data, method, header, success, fail });
   const params = {
     url,
     method,
@@ -129,7 +129,7 @@ function request({ url, data, method, header, success, fail }) {
       });
     return;
   }
-  console.log(7272727272, params);
+  // console.log(7272727272, params);
   return axios(params);
 }
 

+ 1 - 1
src/utils/utils.js

@@ -266,7 +266,7 @@ export function getUTMSource() {
     let sourceObj = {}
     // 存储在storage中的参数(有其他参数)
     let miniAppOptionsQuery = uni.getStorageSync("options_query");
-    console.log(273, 'miniAppOptionsQuery', miniAppOptionsQuery)
+    // console.log(273, 'miniAppOptionsQuery', miniAppOptionsQuery)
     if (!miniAppOptionsQuery || JSON.stringify(miniAppOptionsQuery) == '{}') {
         // 直接进入的utm_lbs是空的
         // const mallid = uni.getStorageSync("mallid")