浏览代码

优化部分代码

zaijin 2 年之前
父节点
当前提交
f2df441f5d

+ 4 - 5
common/apiurl.js

@@ -1,4 +1,4 @@
-const apiurl = {
+export const apiurl = {
   //反馈
   feedbackAddUrl: '/client/articleFeedback/add',
   // 获取微信用户信息
@@ -87,6 +87,7 @@ const apiurl = {
   getSystermsApi: '/client/systerms/getByType/',
   //车位锁新增车牌信息
   bindVehicleNoApi: '/client/orderinfo/bindVehicleNo',
+  // 第二版本验证码
   codeV2Url: {
     // 发送验证码V2
     sendSmsCodeV2Url: '/client/auth/sendSmsCodeV2',
@@ -131,10 +132,8 @@ const apiurl = {
   couponListUrl: '/client/couponInfo/couponList',
   // 兑换优惠券
   exchangeCouponUrl: '/client/couponInfo/couponExchange',
-	// 根据订单号刷新优惠券状态(用于取消支付情况)
-	updateCouponStatusUrl: '/client/couponInfo/backCoupon',
+  // 根据订单号刷新优惠券状态(用于取消支付情况)
+  updateCouponStatusUrl: '/client/couponInfo/backCoupon',
   // 根据订单id获取符合要求的优惠券
   getCouponByOrderIdUrl: '/client/couponInfo/memberCoupon'
 };
-
-export { apiurl };

+ 7 - 11
common/config.js

@@ -3,18 +3,14 @@
  * 在本地运行该环境为未定义,设置初始baseUrl
  * 只有在打包环境下才会有H_NODE_ENV
  */
-const node_dev = process.env.H_NODE_ENV
+const node_dev = process.env.H_NODE_ENV;
 let baseUrl = 'https://wx.hw.hongweisoft.com/parking',
-wxAppid = 'wx6e9cdf7a0ee8a51b'
+  wxAppid = 'wx6e9cdf7a0ee8a51b';
 console.log(process.env.H_BASE_URL);
 if (node_dev) {
-	baseUrl = process.env.H_BASE_URL,
-	wxAppid = process.env.H_WXAPPID
+  (baseUrl = process.env.H_BASE_URL), (wxAppid = process.env.H_WXAPPID);
 }
-const config = {
-	wxAppid,
-	baseUrl
-}
-export {
-	config
-}
+export const config = {
+  wxAppid,
+  baseUrl
+};

+ 13 - 13
common/http.api.js

@@ -58,16 +58,16 @@ const install = (Vue, vm) => {
   let nearRoadsl = (params = {}) => vm.$u.post(apiurl.nearRoadslUrl, params);
   let roadChargeRule = (params = {}) => vm.$u.get(apiurl.roadsChargeRuleUrl + params.roadNo);
 
-	let nearParkingLot = (params = {}) => vm.$u.get(apiurl.nearParkingLotUrl, params);
-	let parkingLotChargeRule = (params = {}) => vm.$u.get(apiurl.parkingLotChargeRuleUrl + params.parkNo, params);
+  let nearParkingLot = (params = {}) => vm.$u.get(apiurl.nearParkingLotUrl, params);
+  let parkingLotChargeRule = (params = {}) => vm.$u.get(apiurl.parkingLotChargeRuleUrl + params.parkNo, params);
 
   let monthInfo = (params = {}) => vm.$u.get(apiurl.monthInfoUrl, params);
   let createMonth = (params = {}) => vm.$u.post(apiurl.createMonthUrl, params);
   let monthPay = (params = {}) => vm.$u.post(apiurl.monthPayUrl, params);
   let getMonthPay = (params = {}) => vm.$u.get(apiurl.getMonthPayUrl + params.id);
   let getMonthList = (params = {}) => vm.$u.get(apiurl.getMonthListUrl, params);
-	// 停车场包月列表
-	let getParkMonthList = (params = {}) => vm.$u.get(apiurl.getParkMonthListUrl, params);
+  // 停车场包月列表
+  let getParkMonthList = (params = {}) => vm.$u.get(apiurl.getParkMonthListUrl, params);
   let cancelMonth = (params = {}) => vm.$u.put(apiurl.cancelMonthUrl + params.monthId);
 
   let feePay = (params = {}) => vm.$u.put(apiurl.feePayUrl + params.vehicleId);
@@ -115,10 +115,10 @@ const install = (Vue, vm) => {
   let parkingWechatPayApi = (params = {}) => vm.$u.post(apiurl.parkingWechatPayUrl, params);
   let getParamsApi = (params = {}) => vm.$u.get(apiurl.getParamsUrl + params.key);
   let wechatMonthlyPayapi = (params = {}) => vm.$u.post(apiurl.wechatMonthlyPayUrl, params);
-	let monthlyRuleDetailsApi = (params = {}) => vm.$u.get(apiurl.monthlyRuleDetailsUrl, params);
-	let couponListApi = (params = {}) => vm.$u.get(apiurl.couponListUrl, params);
+  let monthlyRuleDetailsApi = (params = {}) => vm.$u.get(apiurl.monthlyRuleDetailsUrl, params);
+  let couponListApi = (params = {}) => vm.$u.get(apiurl.couponListUrl, params);
   let exchangeCouponApi = (params = {}) => vm.$u.put(apiurl.exchangeCouponUrl, params);
-	let updateCouponStatusApi = (params = {}) => vm.$u.post(apiurl.updateCouponStatusUrl, params);
+  let updateCouponStatusApi = (params = {}) => vm.$u.post(apiurl.updateCouponStatusUrl, params);
   let getCouponByOrderIdApi = (params = {}) => vm.$u.get(apiurl.getCouponByOrderIdUrl, params);
   // 将各个定义的接口名称,统一放进对象挂载到vm.$u.api(因为vm就是this,也即this.$u.api)下
   vm.$u.api = {
@@ -142,8 +142,8 @@ const install = (Vue, vm) => {
     gzbank,
     nearRoadsl,
     roadChargeRule,
-		nearParkingLot,
-		parkingLotChargeRule,
+    nearParkingLot,
+    parkingLotChargeRule,
     getMessageList,
     payGzbank,
     monthInfo,
@@ -151,7 +151,7 @@ const install = (Vue, vm) => {
     monthPay,
     getMonthPay,
     getMonthList,
-		getParkMonthList,
+    getParkMonthList,
     cancelMonth,
     messageRead,
     feePay,
@@ -181,10 +181,10 @@ const install = (Vue, vm) => {
     parkingWechatPayApi,
     getParamsApi,
     wechatMonthlyPayapi,
-		monthlyRuleDetailsApi,
-		couponListApi,
+    monthlyRuleDetailsApi,
+    couponListApi,
     exchangeCouponApi,
-		updateCouponStatusApi,
+    updateCouponStatusApi,
     getCouponByOrderIdApi
   };
 };

+ 2 - 2
components/swiper-list-item/swiper-list-item.vue → components/coupon-swiper-list-item/coupon-swiper-list-item.vue

@@ -22,12 +22,12 @@
           </template>
           <template v-else-if="Number(item.status) === 1">
             <view class="clit-right">
-              <u-image width="128rpx" height="128rpx" src="/static/img/have-used-icon.svg"/>
+              <u-image width="128rpx" height="128rpx" src="/static/img/have-used-icon.svg" />
             </view>
           </template>
           <template v-else-if="Number(item.status) === 2">
             <view class="clit-right">
-              <u-image width="128rpx" height="128rpx" src="/static/img/have-overdued-icon.svg"/>
+              <u-image width="128rpx" height="128rpx" src="/static/img/have-overdued-icon.svg" />
             </view>
           </template>
         </view>

+ 28 - 28
package.json

@@ -1,30 +1,30 @@
 {
-	"uni-app": {
-		"scripts": {
-			"build:test": {
-				"title": "build:test",
-				"env": {
-					"UNI_PLATFORM": "h5",
-					"H_NODE_ENV": "development",
-					"H_BASE_URL": "https://wx.hw.hongweisoft.com/parking",
-					"H_WXAPPID": "wx6e9cdf7a0ee8a51b",
-					"DESCRIBE": "测试环境"
-				}
-			},
-			"build:pro": {
-				"title": "build:pro",
-				"env": {
-					"UNI_PLATFORM": "h5",
-					"H_NODE_ENV": "production",
-					"H_BASE_URL": "https://parking.pdzhtc.com",
-					"H_WXAPPID": "wx45c3cf2b632f5fd5",
-					"DESCRIBE": "正式环境"
-				}
-			}
-		}
-	},
-	"dependencies": {
-		"vue-jsonp": "^2.0.0",
-		"weixin-js-sdk": "^1.6.0"
-	}
+  "uni-app": {
+    "scripts": {
+      "build:test": {
+        "title": "build:test",
+        "env": {
+          "UNI_PLATFORM": "h5",
+          "H_NODE_ENV": "development",
+          "H_BASE_URL": "https://wx.hw.hongweisoft.com/parking",
+          "H_WXAPPID": "wx6e9cdf7a0ee8a51b",
+          "DESCRIBE": "测试环境"
+        }
+      },
+      "build:pro": {
+        "title": "build:pro",
+        "env": {
+          "UNI_PLATFORM": "h5",
+          "H_NODE_ENV": "production",
+          "H_BASE_URL": "https://parking.pdzhtc.com",
+          "H_WXAPPID": "wx45c3cf2b632f5fd5",
+          "DESCRIBE": "正式环境"
+        }
+      }
+    }
+  },
+  "dependencies": {
+    "vue-jsonp": "^2.0.0",
+    "weixin-js-sdk": "^1.6.0"
+  }
 }

+ 2 - 2
pages/center/coupon/myCoupon/myCoupon.vue

@@ -19,7 +19,7 @@
             <u-input class="search-part-input" v-model="form.exchangeCode" placeholder="请输入兑换码" />
             <u-button class="search-part-btn" type="primary" shape="circle" size="medium" @click.stop="handleExchange">兑换</u-button>
           </view>
-          <swiper-list-item :tabIndex="index" :currentIndex="current" ref="swiperListItem"></swiper-list-item>
+          <coupon-swiper-list-item :tabIndex="index" :currentIndex="current" ref="swiperListItem" />
         </swiper-item>
       </swiper>
       <!-- 绑定车牌 -->
@@ -299,7 +299,7 @@ export default {
     customBack() {
       this.$u.route({
         type: 'switchTab',
-        url: 'pages/index/index'
+        url: 'pages/center/index'
       });
     }
   }

+ 4 - 5
pages/center/index.vue

@@ -57,9 +57,9 @@
     <u-select v-model="callPhoneShow" :list="callPhoneList" @confirm="phoneCall"></u-select>
 
     <view class="u-m-t-20">
-			<u-cell-group>
-				<u-cell-item icon="coupon" title="我的优惠券" @click="openPage('/pages/center/coupon/myCoupon/myCoupon')"></u-cell-item>
-			</u-cell-group>
+      <u-cell-group>
+        <u-cell-item icon="coupon" title="我的优惠券" @click="openPage('/pages/center/coupon/myCoupon/myCoupon')"></u-cell-item>
+      </u-cell-group>
     </view>
 
     <!-- ===================================== 登出提示 ===================================== -->
@@ -85,7 +85,6 @@
 </template>
 
 <script>
-import getUrlParams from '../../utils/getUrlParams.js';
 export default {
   data() {
     return {
@@ -256,4 +255,4 @@ page {
   text-align: center;
   margin: 30rpx 0;
 }
-</style>
+</style>

+ 3 - 3
pages/payLists/payLists.vue

@@ -101,12 +101,12 @@
 
     <view class="bottom">
       <view class="bottom-total">
-        累计欠费<span class="total">{{ totalCount }}</span
-        >笔,合计<span class="total">{{ totalPayAmount }}</span
+        累计欠费<span class="total">{{ totalCount || 0 }}</span
+        >笔,合计<span class="total">{{ totalPayAmount || 0 }}</span
         >元
       </view>
       <view class="button-wrap" v-if="payList.length && payList.length >= 1">
-        <button class="button" type="primary" @click="confirmPrice()">全部缴费</button>
+        <button class="button" type="primary" :disabled="!totalPayAmount" @click="confirmPrice()">全部缴费</button>
       </view>
     </view>