优化调整

components/no-data/no-data.vue

@@ -38,6 +38,7 @@ export default {
 	flex-direction: column;
 	align-items: center;
 	background-color: #fff;
+	margin-top: 20px;
 
 	&.full {
 		// height: 100%;

pages/community/index.vue

@@ -29,7 +29,9 @@
 			return {
 				page: {
 					pageSize: 20,
-					pageNo: 1
+					pageNo: 1,
+					column: 'createTime',
+					order: 'desc'
 				},
 				dataList: [],
 				isFinish: false

pages/home/index.vue

@@ -6,11 +6,11 @@
 					<view class="title">
 						<view class="icons">
 							<view class="box">
-								<image :src="userAvatar" class="icon" v-if="userAvatar"></image>
+								<image :src="userAvatar" class="icon" v-if="isLogin && userAvatar"></image>
 								<uni-icons type="person" size="20px" color="#666666" v-else
 									@click="toLogin"></uni-icons>
 							</view>
-							<view class="name" v-if="userName">{{userName}}</view>
+							<view class="name" v-if="isLogin && userName">{{userName}}</view>
 							<view class="name" v-else @click="toLogin">未登录</view>
 						</view>
 					</view>
@@ -215,10 +215,12 @@
 		computed: {},
 		methods: {
 			toLogin() {
-				uni.hideTabBar()
-				this.$nextTick(() => {
-					this.$refs.authorization.onOpenLogin()
-				});
+				if (!this.isLogin) {
+					uni.hideTabBar()
+					this.$nextTick(() => {
+						this.$refs.authorization.onOpenLogin()
+					});
+				}
 			},
 			async getPropertyAdv() {
 				let {
@@ -385,7 +387,7 @@
 					url
 				});
 			},
-			initData(){
+			initData() {
 				this.getPropertyAdv()
 				const token = uni.getStorageSync('token');
 				//console.log(token)

pages/mine/index.vue

@@ -6,7 +6,7 @@
 				<template v-if="isLogin && userAvatar">
 					<image :src="userAvatar" class="icon"></image>
 				</template>
-				<view class="icon" v-else>
+				<view class="icon" @click="toLogin" v-else>
 					<uni-icons type="person" size="50px" color="#6A59F2"></uni-icons>
 				</view>
 				<template v-if="isLogin">
@@ -43,17 +43,19 @@
 		},
 		methods: {
 			toLogin() {
-				uni.hideTabBar()
-				this.$nextTick(() => {
-					this.$refs.authorization.onOpenLogin()
-				});
+				if (!this.isLogin) {
+					uni.hideTabBar()
+					this.$nextTick(() => {
+						this.$refs.authorization.onOpenLogin()
+					});
+				}
 			},
 			logout() {
 				let _this = this
 				uni.showModal({
 					title: '警告',
 					content: '确定退出登录!',
-					showCancel: false,
+					showCancel: true,
 					success: function(res) {
 						if (res.confirm) {
 							wx.clearStorage()

pages/myCommunityList/index.vue

@@ -37,7 +37,9 @@
 			return {
 				page: {
 					pageSize: 10,
-					pageNo: 1
+					pageNo: 1,
+					column: 'createTime',
+					order: 'desc'
 				},
 				dataList: [],
 				isFinish: false,

pages/myInformation/index.vue

@@ -126,7 +126,8 @@
 						//platformCode: userInfo.platformCode
 					}
 					uni.setStorageSync('user_phone', userInfo.phone);
-					uni.setStorageSync('user_name', avatar);
+					uni.setStorageSync('user_name', userInfo.realname);
+					uni.setStorageSync('user_avatar', avatar)
 				}
 			},
 			onOpenAvatar() {

pages/reconciliationDetails/index.vue

@@ -7,6 +7,10 @@
 						<view class="name">订单编号</view>
 						<view class="detail">{{details.orderNum}}</view>
 					</view>
+					<view class="item" v-if="details.balanceNum">
+						<view class="name">结算单号</view>
+						<view class="detail">{{details.balanceNum}}</view>
+					</view>
 					<view class="item">
 						<view class="name">订单状态</view>
 						<view class="tag">{{details.reconciliationStatusName}}</view>
@@ -56,7 +60,7 @@
 						<view class="detail">{{details.partnersName}}</view>
 					</view>
 				</view>
-				<view class="form" v-if="details.reconciliationStatus === 1">
+				<view class="form" v-if="details.reconciliationStatus === 1 || details.reconciliationStatus === 4">
 					<uni-forms>
 						<view class="form-item-text">
 							<view class="title">备注</view>
@@ -116,13 +120,13 @@
 				}
 			},
 			async toSubmit() {
-				if (!this.formData.remarks) {
-					uni.showToast({
-						title: '请填写备注！',
-						icon: 'none'
-					});
-					return false
-				}
+				// if (!this.formData.remarks) {
+				// 	uni.showToast({
+				// 		title: '请填写备注！',
+				// 		icon: 'none'
+				// 	});
+				// 	return false
+				// }
 				let params = {
 					id: this.details.id,
 					remarks: this.formData.remarks

pages/reconciliationList/index.vue

@@ -39,6 +39,11 @@
 								<view class="name">分利金额</view>
 								<view class="detail">￥{{item.shareMoney}}</view>
 							</view>
+							<view class="text" v-if="item.balanceNum">
+								<view class="name">结算单号</view>
+								<view class="detail">{{item.balanceNum}}</view>
+							</view>
+							
 							<view class="text">
 								<view class="name">订单时间</view>
 								<view class="detail">{{item.createTime}}</view>
@@ -78,7 +83,9 @@
 					platformType: 'partner',
 					reconciliationStatus: 1,
 					pageSize: 10,
-					pageNo: 1
+					pageNo: 1,
+					column: 'createTime',
+					order: 'desc'
 				},
 				dataList: [],
 				isFinish: false,
@@ -137,14 +144,15 @@
 			}
 		},
 		onLoad() {
-			const token = uni.getStorageSync('token');
-			if (token) {
-				this.getList()
-			}
+			// const token = uni.getStorageSync('token');
+			// if (token) {
+			// 	this.getList()
+			// }
 		},
 		onShow() {
 			const token = uni.getStorageSync('token');
 			if (token) {
+				this.dataList = [];
 				this.getList()
 			}
 		},

pages/settlementApplyfor/index.vue

@@ -166,13 +166,13 @@
 					});
 					return false
 				}
-				if (!this.formData.remarks) {
-					uni.showToast({
-						title: '请填写备注！',
-						icon: 'none'
-					});
-					return false
-				}
+				// if (!this.formData.remarks) {
+				// 	uni.showToast({
+				// 		title: '请填写备注！',
+				// 		icon: 'none'
+				// 	});
+				// 	return false
+				// }
 				let params = {
 					balanceWay: '微信转账',
 					bankCard: '工行1234567890',

pages/settlementList/index.vue

@@ -73,7 +73,9 @@
 					platformType: 'partner',
 					balanceStatus: 2,
 					pageSize: 10,
-					pageNo: 1
+					pageNo: 1,
+					column: 'createTime',
+					order: 'desc'
 				},
 				dataList: [],
 				isFinish: false,
@@ -136,14 +138,15 @@
 			}
 		},
 		onLoad() {
-			const token = uni.getStorageSync('token');
-			if (token) {
-				this.getList()
-			}
+			// const token = uni.getStorageSync('token');
+			// if (token) {
+			// 	this.getList()
+			// }
 		},
 		onShow() {
 			const token = uni.getStorageSync('token');
 			if (token) {
+				this.dataList = [];
 				this.getList()
 			}
 		},

pages/shopsDetails/index.vue

@@ -53,7 +53,7 @@
 					</view>
 				</view>
 				<view class="form-submit" @click="onSubmit" v-if="communityCode">确认绑定</view>
-				<view class="form-submit" @click="toCode" v-if="!communityCode && details.auditStatus == 'auditPass'">
+				<view class="form-submit" @click="toCode" v-if="!communityCode">
 					商铺收款二维码</view>
 			</view>
 		</view>
@@ -88,8 +88,10 @@
 			async onSubmit() {
 				if (this.details.shopCode && this.communityCode) {
 					await partnersShopAdd({
+						shopName: this.details.shopName,
 						shopCode: this.details.shopCode,
-						communityCode: this.communityCode
+						communityCode: this.communityCode,
+						communityName: this.details.platformName
 					})
 					setTimeout(() => {
 						uni.showToast({

pages/shopsList/index.vue

@@ -10,8 +10,8 @@
 					<image mode="aspectFill" :src="imageURL+item.shopInfo.logoUrl" class="icon"></image>
 					<view class="con">
 						<view class="name">{{item.shopName}}
-							<view class="tag purple" v-if="item.bindPartners === 'Y'">未绑定</view>
-							<view class="tag gray" v-else>已绑定</view>
+							<view class="tag purple" v-if="item.bindPartners === 'Y' && item.auditStatus === 'auditPass' && item.shopStatus === 'normal'">选择</view>
+							<view class="tag gray" v-else>选择</view>
 						</view>
 						<view class="text">{{item.shopInfo.shopContent}}</view>
 						<view class="card">
@@ -44,8 +44,8 @@
 					order: 'desc',
 					pageSize: 10,
 					pageNo: 1,
-					auditStatus: 'auditPass',
-					shopStatus: 'normal'
+					// auditStatus: 'auditPass',
+					// shopStatus: 'normal'
 				},
 				dataList: [],
 				isFinish: false,
@@ -89,14 +89,14 @@
 			},
 			toDetails(item) {
 				if (item.shopInfo.id) {
-					if (item.bindPartners === 'Y') {
+					if (item.bindPartners === 'Y' && item.auditStatus === 'auditPass' && item.shopStatus === 'normal') {
 						uni.navigateTo({
 							url: `/pages/shopsDetails/index?id=${item.shopInfo.id}&code=${this.communityCode}`
 						});
 					} else {
 						uni.showToast({
 							icon: "none",
-							title: '该商铺已绑定合作伙伴,请重新选择！'
+							title: '该商铺无法绑定,请重新选择！'
 						})
 					}
 				}

pages/withdrawalList/index.vue

@@ -53,7 +53,9 @@
 					platformType: 'partner',
 					balanceStatus: 3,
 					pageSize: 10,
-					pageNo: 1
+					pageNo: 1,
+					column: 'createTime',
+					order: 'desc'
 				},
 				dataList: [],
 				isFinish: false,