2

common/js/api.js

@@ -94,18 +94,21 @@ let API = {
 				// 200=成功， 400 = 失败错误返回、404 token验证失败  ,403 token已过2小时失效
 				if(res.data.code==200){
 					success && success(res.data);
-				}else if(res.data.code==403){
+					return;
+				}
+				
+				uni.showToast({
+					title: res.data.msg || res.msg,
+					icon: 'none'
+				})
+				
+				if(res.data.code==403 || res.data.code==201){
 					uni.removeStorageSync('user_token');
 					setTimeout(()=>{
 						uni.reLaunch({
 							url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
 						})
 					}, 1000)
-				}else{
-					uni.showToast({
-						title: res.data.msg,
-						icon: 'none'
-					})
 				}
 			}
 		})

pages/about/bannerManage/addBanner.vue

@@ -150,6 +150,7 @@
 			padding: 0px 10px;
 			box-sizing: border-box;
 			color: #444;
+			font-size: 14px;
 		}
 	}
 	.submit{

pages/about/bonusSet/bonusList.vue

@@ -6,10 +6,13 @@
 				<view class="icon_new"><image :src="item.cover_image" mode=""></image></view>
 				<view style="flex:1;">
 					<view class=""><text>面值：</text>{{item.price}}</view>
-					<view style="font-size: 12px;"><text>最高中奖金额：</text>{{item.max_awards_amount}}</view>
+					<view style="font-size: 12px;"><text>最高中奖金额：</text>{{item.max_awards_amount | formatAmount}}</view>
 				</view>
 				<switch :checked="item.status==1" @change="clickSwitch($event, index)" color="#00E266" @click.stop="" />
 			</view>
+			<view class="" v-if="datasList.length===0" style="color: #999;text-align: center;padding: 40rpx;">
+				- 暂无记录 -
+			</view>
 		</view>
 	</view>
 </template>
@@ -30,6 +33,16 @@
 				
 			}
 		},
+		filters: {
+			formatAmount(item){
+				if(item>999999 && item==1000000){
+					return '一百万元'
+				}
+				if(item.split('.')[1].length>2){
+					return (+item).toFixed(2);
+				}
+			}
+		},
 		methods: {
 			toSet(id){
 				uni.navigateTo({
@@ -76,7 +89,8 @@
 				this.getList();
 			}else{
 				uni.showToast({
-					title: '没有更多了'
+					title: '没有更多了',
+					icon: 'none'
 				})
 			}
 		}

pages/about/bonusSet/bonusSet.vue

@@ -108,7 +108,7 @@
 			},
 			getList(){
 				API.request('/adminZoneManage/goodsParamList', {zone_goods_id:this.id}, res=>{
-					this.setList = res.data;
+					this.setList = res.data.list;
 				})
 				
 			}

pages/about/bonusSet/index.vue

@@ -69,7 +69,8 @@
 				this.getList();
 			}else{
 				uni.showToast({
-					title: '没有更多了'
+					title: '没有更多了',
+					icon: 'none'
 				})
 			}
 		}

pages/about/serviceSet/serviceSet.vue

@@ -132,7 +132,8 @@
 				this.getList();
 			}else{
 				uni.showToast({
-					title: '没有更多了'
+					title: '没有更多了',
+					icon: 'none'
 				})
 			}
 		}

pages/home/home.vue

@@ -167,6 +167,7 @@
 					this.getAwardRecords();
 					this.getNotice();
 				}else if(this.userType=='background'){
+					this.chartIndex = 1;
 					updateTabBar.changebackground();
 					this.getNeedSta();
 					this.getUserSta();
@@ -182,15 +183,20 @@
 			}, 500)
 			
 		},
+		onHide() {
+			if(this.userType=='user' && this.isPlay){
+				this.isPlay = false;
+				this.innerAudioContext.pause();
+			}
+		},
 		created() {
 			this.userType = uni.getStorageSync('userType');
-			
 		},
 		mounted() {
 			if(this.userType=='user'){
 				this.innerAudioContext = uni.createInnerAudioContext();
 				this.innerAudioContext.autoplay = false;
-				this.innerAudioContext.src = 'https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-hello-uniapp/2cc220e0-c27a-11ea-9dfb-6da8e309e0d8.mp3';
+				this.innerAudioContext.src = '../../static/audio/bgm.mp3';
 				this.innerAudioContext.onPlay(() => {
 				  console.log('开始播放');
 				});
@@ -251,7 +257,7 @@
 					grid: {
 						top: '12%',
 						bottom: '12%',
-						left: '10%',
+						left: '18%',
 						right: '5%'
 					},
 				  tooltip: {},

pages/list/agent.vue

@@ -48,7 +48,7 @@
 					</view>
 					<view class="input_box">
 						<view class="">密码:</view>
-						<input password placeholder="请输入新密码" v-model="editInfo.password">
+						<input placeholder="请输入新密码" v-model="editInfo.password">
 					</view>
 				</view>
 				<view class="btngroup">
@@ -186,7 +186,7 @@
 						this.search();
 					})
 				}else if(this.editType=='edit'){
-					API.request('/adminAgentTeam/editUser', {
+					API.request('/adminAgentTeam/editAgent', {
 						aid: this.editInfo.id,
 						password: this.editInfo.password
 					}, res=>{
@@ -256,7 +256,8 @@
 				this.getAgentList();
 			}else{
 				uni.showToast({
-					title: '没有更多了'
+					title: '没有更多了',
+					icon: 'none'
 				})
 			}
 		}

pages/list/team.vue

@@ -37,7 +37,7 @@
 						<view class="">可提余额：<text>{{scoreInfo.withdrawal_balance}}</text></view>
 					</view>
 					<view class="input_box">
-						<input password :placeholder="scoreTip" v-model="limit">
+						<input type="number" :placeholder="scoreTip" v-model="limit">
 					</view>
 				</view>
 				<view class="btngroup">
@@ -132,16 +132,19 @@
 			}
 		},
 		onLoad() {
-			this.getDataList();
 			updateTabBar.changeAgent();
 		},
+		onShow() {
+			this.getDataList();
+		},
 		onReachBottom() {
 			if(!this.noMore){
 				this.page++;
 				this.getDataList();
 			}else{
 				uni.showToast({
-					title: '没有更多了'
+					title: '没有更多了',
+					icon: 'none'
 				})
 			}
 		}

pages/list/user.vue

@@ -49,7 +49,7 @@
 					</view>
 					<view class="input_box">
 						<view class="">密码:</view>
-						<input password placeholder="请输入新密码" v-model="editInfo.password">
+						<input placeholder="请输入新密码" v-model="editInfo.password">
 					</view>
 				</view>
 				<view class="btngroup">
@@ -257,7 +257,8 @@
 				this.getUserList();
 			}else{
 				uni.showToast({
-					title: '没有更多了'
+					title: '没有更多了',
+					icon: 'none'
 				})
 			}
 		}

pages/serivce/serivce.vue

@@ -6,8 +6,8 @@
 				<image src="../../static/user/icon_manager2.png" mode=""></image>
 				<view class="">客服名：<text style="color:#101010;">{{item.name}}</text></view>
 			</view>
-			<view class="line2">微信号码：<text style="color:#101010;">{{item.wx}}</text></view>
+			<view class="line2">微信号码：<text style="color:#101010;">{{item.wx_number}}</text></view>
-			<view class="btn" @click="copyNum(item.wx)">复制联系方式</view>
+			<view class="btn" @click="copyNum(item.wx_number)">复制联系方式</view>
 		</view>
 		<view class="" v-if="serviceList.length===0" style="color: #999;text-align: center;padding: 40rpx;">
 			- 暂无记录 -
@@ -21,14 +21,7 @@
 		data() {
 			return {
 				serviceList:[
-					{
+					
-						name: '100.00',
-						wx: '17177771111',
-					},
-					{
-						name: '100.00',
-						wx: '1000.00',
-					},
 				],
 				page: 1,
 				noMore: true,

pages/ucenter/ucenter.vue

@@ -324,6 +324,11 @@
 				showBadge: this.appVersion.hasNew
 			})
 			//#endif
+			
+			
+		},
+		onShow() {
+			this.userType = uni.getStorageSync('userType');
 			if(uni.getStorageSync('userType')=='background'){
 				this.getAdminUserInfo();
 			}else if(uni.getStorageSync('userType')=='agent'){
@@ -331,10 +336,6 @@
 			}else{
 				this.getUserInfo();
 			}
-			
-		},
-		onShow() {
-			this.userType = uni.getStorageSync('userType');
 			// if(this.userType=='user'){
 			// 	updateTabBar.changeUser();
 			// }else if(this.userType=='agent'){