代码提交

manifest.json

@@ -116,7 +116,10 @@
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "获取当前区域定位以选取附近场馆"
-            }
+            },
+			"requiredPrivateInfos": [
+						"getLocation"
+					]
         }
     },
     "h5" : {

pages/index/index.vue

@@ -162,11 +162,11 @@
 		},
 		onLoad() {
 			// _self = this; // 浏览器调试时需要打开，微信调试时需关闭
-			if (!uni.getStorageSync('token')) {
+			/*if (!uni.getStorageSync('token')) {
 				uni.navigateTo({
 					url: '/pages/login/index'
 				});
-			}
+			}*/
 		},
 		onReady() {
 			//这里的 750 对应 css .charts 的 width
@@ -183,6 +183,7 @@
 				} else {
 					this.imgWidth='300rpx'
 					this.imgHeight='120rpx'
+					this.navbarList.push(this.business)
 					//this.navbarList.push(this.empty)
 				}
 			}

pages/login/index.vue

@@ -18,7 +18,7 @@
 				<!-- #endif -->
 				<!-- #ifdef MP-WEIXIN -->
 				<u-button type="warning" :ripple="true" :custom-style="{...customStyle, backgroundColor: '#07c160'}" open-type="getPhoneNumber"
-				 @getphonenumber="getUserinfoWechat" withCredentials="true">微信一键登录</u-button>
+				 @getphonenumber="getUserinfoWechat" withCredentials="true">一键登录</u-button>
 				<!-- #endif -->
 			</view>
 		</u-card>

pagesEnroll/enrolledForm.vue

@@ -10,6 +10,14 @@
 					</u-checkbox>
 				</u-checkbox-group>
 			</u-form-item>
+			<u-form-item label="训练服" prop="payTypeName">
+<!-- 				<text>{{form.payTypeName}}</text> -->
+				<u-checkbox-group>
+					<u-checkbox v-model="clothingChecked" name="clothingChecked" @change="clothingCheckboxChange">
+						100元训练服
+					</u-checkbox>
+				</u-checkbox-group>
+			</u-form-item>
 <!-- 			<u-form-item v-if="payTypeReasonShow" label="备注" prop="payTypeReason" required>
 				<u-input v-model="form.payTypeReason" placeholder="请输入支付备注" />
 			</u-form-item> -->
@@ -220,6 +228,7 @@
 				talkerShow: false,
 				talkerList: [],
 				payTypeShow: false,
+				clothingChecked: false,
 				payTypeList: [],
 				/*payTypeList: [
 					{
@@ -296,6 +305,9 @@
 					this.form.payTypeId.splice(itemIndex, 1)
 				}
 			},
+			clothingCheckboxChange(data){
+				console.log(data)
+			},
 			handleInputBlur(e) {
 				this.getQrCodeData(e)
 			},
@@ -344,7 +356,8 @@
 						this.form.discountCouponId = res.data.couponList[0].id
 						this.form.content = res.data.couponList[0].content
 					} else {
-							this.form.content = '无可用优惠券'
+						this.form.discountCouponId = ""
+						this.form.content = '无可用优惠券'
 					}
 					this.form.orderNo = res.data.orderNo
 				}).catch(error => {
@@ -406,6 +419,7 @@
 				NET.request(API.getVenueListInfo, {
 						...uni.getStorageSync('locationData'),
 				}, 'POST').then(res => {
+					console.log(res.data)
 					this.venueList = res.data
 				}).catch(error => {
 					this.$refs.uTips.show({
@@ -464,6 +478,7 @@
 			},
 			//  提交表单
 			submitForm() {
+				this.form.suitFee = this.clothingChecked
 				console.log(this.form);
 				let message = ''
 				if(this.form.payTypeId.length == 0) {

pagesMain/businessList.vue

@@ -35,7 +35,7 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
-		<u-icon name="plus-circle-fill" :color="mainColor" size="96" class="fix-add-icon" @click="handleThreadAddClick"></u-icon>
+		<u-icon v-if="userId!=274" name="plus-circle-fill" :color="mainColor" size="96" class="fix-add-icon" @click="handleThreadAddClick"></u-icon>
 		<!-- 标签 -->
 		<u-action-sheet :list="signList" v-model="signShow" @click="handleSetSexClick"></u-action-sheet>
 		<!-- 销售 -->
@@ -62,6 +62,7 @@
 		},
 		data() {
 			return {
+				userId:'',
 				customerId: '',
 				// filterText: '',
 				applyTitle: '已分配',
@@ -131,6 +132,7 @@
 			}
 		},
 		onShow() {
+			this.userId=uni.getStorageSync('userData').userId
 			this.getTable()
 		},
 		onReady() {},

pagesMain/customerList.vue

@@ -36,7 +36,7 @@
 			</swiper-item>
 		</swiper>
 		<!-- 新增客户 -->
-		<u-icon name="plus-circle-fill" :color="mainColor" size="96" class="fix-add-icon" @click="handleAddApplyClick"></u-icon>
+		<u-icon v-if="userId!=274" name="plus-circle-fill" :color="mainColor" size="96" class="fix-add-icon" @click="handleAddApplyClick"></u-icon>
 		<!-- 无效备注 -->
 		<u-popup v-model="invalidShow" mode="center" border-radius="30" width="600rpx">
 			<view class="common-title">备注</view>
@@ -89,6 +89,7 @@
 		},
 		data() {
 			return {
+				userId:'',
 				contractShow:false,
 				contractUrls:[
 				],
@@ -141,6 +142,7 @@
 			}
 		},
 		onShow() {
+			this.userId=uni.getStorageSync('userData').userId
 			this.tabList = Object.assign([], this.$options.data().tabList)
 			this.getTableList(0)
 			this.getTableList(1)

pagesMain/threadList.vue

@@ -32,7 +32,7 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
-		<u-icon name="plus-circle-fill" :color="mainColor" size="96" class="fix-add-icon" @click="handleThreadAddClick"></u-icon>
+		<u-icon v-if="userId!=274" name="plus-circle-fill" :color="mainColor" size="96" class="fix-add-icon" @click="handleThreadAddClick"></u-icon>
 		<!-- 标签 -->
 		<u-action-sheet :list="signList" v-model="signShow" @click="handleSetSexClick"></u-action-sheet>
 		<u-top-tips ref="uTips"></u-top-tips>
@@ -56,6 +56,7 @@
 		},
 		data() {
 			return {
+				userId:'',
 				customerId: '',
 				// filterText: '',
 				triggered: false,
@@ -111,6 +112,7 @@
 			}
 		},
 		onShow() {
+			this.userId=uni.getStorageSync('userData').userId
 			this.tabList = Object.assign([], this.$options.data().tabList)
 			this.getTableList(0)
 			this.getTableList(1)

utils/request.js

@@ -24,9 +24,11 @@ const request = (url, data, method = 'GET') => {
 					let data = res.data
 					if (data.status == 30001) {
 						uni.removeStorageSync('token')
-						uni.navigateTo({
-							url: '/pages/login/index'
-						});
+						if(url.indexOf('teamStatistics')==-1&&url.indexOf('center/clueRait')==-1){
+							uni.navigateTo({
+								url: '/pages/login/index'
+							});
+						}
 						return false
 					}
 					if (data.status == 10000) {