Signed-off-by: liuboyan <632697560@qq.com>

bug

config/api.js

@@ -1,5 +1,5 @@
 // const WX_API_BASE = 'https://www.qianjiadi.com/'
-//const WX_API_BASE = 'http://ch.jihengcc.cn:17080/'
+// const WX_API_BASE = 'http://ch.jihengcc.cn:17080/'
 // const WX_API_BASE = 'https://test.jihengcc.cn/'
  const WX_API_BASE = 'https://www.qianjiadi.com/'
 

pages.json

@@ -101,7 +101,8 @@
 		}, {
 			"path": "orderDetail",
 			"style": {
-				"navigationBarTitleText": "订单详情"
+				"navigationBarTitleText": "订单详情",
+				"backgroundColor": "#f7f7f7"
 			}
 		}, {
 			"path": "bindOrder",

pages/index/authorize.vue

@@ -78,6 +78,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 
 			/deep/.u-btn--success--disabled {

pages/index/home.vue

@@ -70,7 +70,7 @@
 			}
 		},
 		onLoad() {
-			if (!uni.getStorageSync('token')) {
+			if (!uni.getStorageSync('token') || uni.getStorageSync('userData').registerFlag != 1 || uni.getStorageSync('userData').auditState != 2) {
 				uni.reLaunch({
 					url: '/pages/index/index'
 				});

pages/index/index.vue

@@ -14,7 +14,8 @@
 			</button>
 			<view class="authorize-info">{{wxPhoneData? '****************' : ''}}</view> -->
 			<view class="authorize-login" @click="getUserInfo">登录</view>
-		</view>{{tipxx}}
+			<view class="authorize-tip">点击登录默认同意<text style="text-decoration: underline;">商家入驻协议</text></view>
+		</view>
 		<u-top-tips ref="uTips"></u-top-tips>
 	</view>
 </template>
@@ -29,7 +30,6 @@
 				wxPhoneData: null,
 				userNmae: '',
 				timer: false,
-				tipxx: '',
 			}
 		},
 		onReady() {
@@ -258,6 +258,18 @@
 				line-height: 36px;
 				text-align: center;
 			}
+			
+			.authorize-tip {
+				width: 220px;
+				height: 20px;
+				float: left;
+				margin: 5px 5px;
+				font-size: 12px;
+				font-family: PingFang SC;
+				color: #FFFFFF;
+				line-height: 20px;
+				text-align: center;
+			}
 		}
 	}
 </style>

pages/index/register.vue

@@ -17,12 +17,12 @@
 			<u-cell-item title="请上传身份证正反面" :arrow="false" class="all-width">
 				<view slot="label" class="id-card-box">
 					<u-upload :action="uploadUrl" :file-list="defaultList3" :form-data="uploadData" @on-success="uploadIdCardSuccess1"
-					 @on-error="uploadError" :custom-btn="true" max-count="1" :style="{width: cWidth + 'px'}">
-						<view slot="addBtn" class="id-card card-img1" :style="{width: cWidth + 'px'}">拍摄正面</view>
+					 @on-error="uploadError" :custom-btn="true" max-count="1" style="margin-right: 16px;" :style="{width: cWidth + 'px', height: (cWidth * 0.66 + 30) + 'px'}">
+						<view slot="addBtn" class="id-card card-img1" :style="{width: cWidth + 'px', height: (cWidth * 0.66 + 30) + 'px', paddingTop: (cWidth * 0.66) + 'px', backgroundSize: '100% ' + (cWidth * 0.66) + 'px'}">拍摄正面</view>
 					</u-upload>
 					<u-upload :action="uploadUrl" :file-list="defaultList4" :form-data="uploadData" @on-success="uploadIdCardSuccess2"
-					 @on-error="uploadError" :custom-btn="true" max-count="1" :style="{width: cWidth + 'px'}">
-						<view slot="addBtn" class="id-card card-img1" :style="{width: cWidth + 'px'}">拍摄反面</view>
+					 @on-error="uploadError" :custom-btn="true" max-count="1" :style="{width: cWidth + 'px', height: (cWidth * 0.66 + 30) + 'px'}">
+						<view slot="addBtn" class="id-card card-img2" :style="{width: cWidth + 'px', height: (cWidth * 0.66 + 30) + 'px', paddingTop: (cWidth * 0.66) + 'px', backgroundSize: '100% ' + (cWidth * 0.66) + 'px'}">拍摄反面</view>
 					</u-upload>
 				</view>
 			</u-cell-item>
@@ -217,9 +217,9 @@
 					})
 					return false
 				}
-				if (this.fileList.length != 3) {
+				if (!this.fileList.length) {
 					this.$refs.uTips.show({
-						title: '店铺主页图需上传三张',
+						title: '请上传店铺主页图',
 						type: 'warning',
 					})
 					return false
@@ -294,10 +294,14 @@
 
 			/deep/.u-label-text {
 				color: #333333;
+				line-height: 40px;
+				font-size: 15px;
 			}
 
 			/deep/.u-cell_title {
 				color: #333333;
+				line-height: 40px;
+				font-size: 15px;
 			}
 
 			.id-card-box {
@@ -380,6 +384,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 
 			// /deep/.u-btn--success--disabled {

pages/index/registerState.vue

@@ -84,7 +84,6 @@
 
 		.status-list {
 			width: 100%;
-			height: calc(100% - 318px);
 			float: left;
 			background: #FFFFFF;
 			box-sizing: border-box;
@@ -156,6 +155,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pages/media/index.vue

@@ -31,7 +31,7 @@
 				<view class="video-card" v-for="(item, index) in list" :key="index" @click="goToVideo(item)">
 					<image class="video-img" :src="item.coverUrl"></image>
 					<view class="video-title-box">
-						<text class="iconfont" :class="item.check ? 'iconqueding' : 'iconfeigouxuan'" @click.stop="item.check = !item.check"
+						<text class="iconfont" :class="item.check ? 'iconqueding' : 'iconfeigouxuan'" @click.stop="setVideoStatue(item)"
 						 v-if="manageType"></text>
 						<view class="video-title">
 							{{item.videoName}}
@@ -70,6 +70,10 @@
 			this.getBaseData('refresh')
 		},
 		methods: {
+			//  取消选中
+			setVideoStatue(item){
+				item.check = !item.check
+			},
 			//  获取全部数据
 			getBaseData(refresh) {
 				this.pageIndex = 1

pagesGood/goodForm.vue

@@ -11,8 +11,8 @@
 				</view>
 			</u-cell-item>
 			<u-cell-item title="原价" :arrow="false">
-				<u-number-box :positive-integer="false" :min="0.01" step="1" v-model="goodInfo.originalPrice" bg-color="#51A539" color="#ffffff"
-				 :disabled="ifEdit()" digit></u-number-box>
+				<u-number-box :positive-integer="false" :min="0.01" step="1" v-model="goodInfo.originalPrice" bg-color="#51A539"
+				 color="#ffffff" :disabled="ifEdit()" digit></u-number-box>
 			</u-cell-item>
 			<u-cell-item :title="formType == 1 ? '售价' : '采摘价格'" :arrow="false" v-if="formType != 2">
 				<u-number-box :positive-integer="false" :min="0.01" v-model="goodInfo.bizPrice" bg-color="#51A539" color="#ffffff"
@@ -141,7 +141,7 @@
 							url: site
 						}
 					})
-					if (this.sortList.length && !this.sortText) {
+					if (this.sortList.length) {
 						let sort = this.sortList.find(site => site.value == res.data.parentId)
 						this.sortText = sort.label + '-' + sort.children.find(site => site.value == res.data.categoryId).label
 					}
@@ -265,8 +265,8 @@
 			// 退格键被点击
 			backspace() {
 				// 删除value的最后一个字符
-				if(this.goodInfo.originalPrice.length)  {
-				   this.goodInfo.originalPrice = this.goodInfo.originalPrice.substr(0, this.goodInfo.originalPrice.length - 1);
+				if (this.goodInfo.originalPrice.length) {
+					this.goodInfo.originalPrice = this.goodInfo.originalPrice.substr(0, this.goodInfo.originalPrice.length - 1);
 				}
 				console.log(this.goodInfo.originalPrice);
 			}
@@ -313,6 +313,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesGood/goodList.vue

@@ -19,11 +19,13 @@
 		</scroll-view>
 		<view class="good-handle">
 			<uni-goods-nav :fill="true" :options="[]" @buttonClick="goodHandle1" :buttonGroup="buttonGroup1" v-if="!manageType" />
-			<uni-goods-nav :fill="true" :options="[]" @buttonClick="goodHandle2" :buttonGroup="buttonGroup2" v-else-if="tabIndex == 0" />
+			<uni-goods-nav :fill="true" :options="[]" @buttonClick="goodHandle2" :buttonGroup="buttonGroup2" class="nav-border"
+			 v-else-if="tabIndex == 0" />
 			<uni-goods-nav :fill="true" :options="[]" @buttonClick="goodHandle2" :buttonGroup="buttonGroup3" v-else-if="tabIndex == 1" />
-			<uni-goods-nav :fill="true" :options="[]" @buttonClick="goodHandle2" :buttonGroup="buttonGroup4" v-else-if="tabIndex == 2" />
+			<uni-goods-nav :fill="true" :options="[]" @buttonClick="goodHandle2" :buttonGroup="buttonGroup4" class="nav-border"
+			 v-else-if="tabIndex == 2" />
 		</view>
-		<u-popup v-model="popupShow" mode="bottom">
+		<u-popup v-model="popupShow" mode="bottom" border-radius="30">
 			<view class="good-handle-box">
 				<u-button class="handle-button" :hair-line="false" @click="addGood(1)">普通售卖</u-button>
 				<u-button class="handle-button" :hair-line="false" @click="addGood(2)">拍卖</u-button>
@@ -249,13 +251,23 @@
 			bottom: 0px;
 			height: 50px;
 			background: #ffffff;
+
+			.nav-border {
+				/deep/.uni-tab__cart-button-right {
+					border-right: 1px solid #74bd60;
+				}
+
+				/deep/.uni-tab__cart-button-right:last-child {
+					border-right: none;
+				}
+			}
 		}
 
 		.good-handle-box {
 			width: 100%;
 			float: left;
 			box-sizing: border-box;
-			padding: 20px;
+			padding: 0 20px 20px 20px;
 
 			.handle-button {
 				width: 100%;
@@ -268,6 +280,10 @@
 				border: none;
 				border-top: 1px solid #E0E0E0;
 				border-radius: 0;
+
+				/deep/button {
+					margin-top: 12px;
+				}
 			}
 
 			.handle-button:first-child {
@@ -278,15 +294,23 @@
 				width: 125px;
 				height: 42px;
 				float: left;
-				background: #F1F1F1;
 				border-radius: 5px;
 				font-size: 16px;
 				font-family: PingFang SC;
-				color: #51A539;
 				line-height: 42px;
 				position: relative;
 				left: 50%;
 				transform: translateX(-50%);
+
+				/deep/button {
+					color: #56a83a !important;
+					background-color: #F2F2F2 !important;
+					line-height: 42px;
+				}
+
+				/deep/button::after {
+					border: none;
+				}
 			}
 
 			/deep/.u-btn--default {

pagesMain/authorizeForm.vue

@@ -208,6 +208,14 @@
 			.handle-custom {
 				background-color: #51A539;
 				margin-bottom: 15px;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/authorizeList.vue

@@ -216,6 +216,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/bindOrder.vue

@@ -74,6 +74,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/couponForm.vue

@@ -98,6 +98,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/couponList.vue

@@ -12,7 +12,7 @@
 				<view class="coupon-text1">{{item.couponName}}</view>
 				<view class="coupon-text1" style="margin-bottom: 4px;">满{{item.fullAmount}}减{{item.discountAmount}}</view>
 				<view class="coupon-text2">{{'仅限用于' + item.name + '的店铺'}}</view>
-				<view class="coupon-text2" style="color: #999999;">有效期：{{item.publishStartTime}}~{{item.useEndTime}}</view>
+				<view class="coupon-text2" style="color: #999999;">请于{{item.useEndTime.split(" ")[0]}}之前使用</view>
 			</view>
 		</view>
 		<u-divider :color="isOver ? '#909399' : '#51A539'" :border-color="isOver ? '#909399' : '#51A539'" @click="handleLoadMore()">
@@ -229,6 +229,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/evaluateForm.vue

@@ -205,6 +205,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/messageForm.vue

@@ -132,6 +132,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/messageList.vue

@@ -185,6 +185,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/orderDetail.vue

@@ -234,6 +234,11 @@
 		}
 	}
 </script>
+<style>
+	page {
+		background-color: #f7f7f7;
+	}
+</style>
 <style lang="less" scoped>
 	page {
 		width: 100%;

pagesMain/orderItem.vue

@@ -132,7 +132,7 @@
 			},
 			//  跳转订单详情
 			goToOrderDetail() {
-				if (this.noPick) {
+				if (this.orderData.noPick) {
 					uni.navigateTo({
 						url: '/pagesMain/orderDetail?orderId=' + this.orderData.orderId + '&orderStatus=' + this.orderData.orderStatus
 					});
@@ -291,13 +291,21 @@
 			text-align: right;
 
 			.handle-button {
-				color: #333333 !important;
-				border-color: #BFBFBF !important;
-				background-color: #FFFFFF !important;
-				padding: 0;
-				margin-left: 8px;
 				height: 30px;
-				line-height: 30px;
+				margin-left: 8px;
+				margin-bottom: 10px;
+				line-height: 28px;
+				text-align: center;
+				box-sizing: border-box;
+				display: inline-block;
+				border-radius: 15px;
+
+				/deep/button {
+					padding: 0 12px;
+					border: 1px solid #BFBFBF !important;
+					background-color: #FFFFFF!important;
+					color: #333333 !important;
+				}
 			}
 		}
 	}

pagesMain/registerForm.vue

@@ -4,14 +4,16 @@
 			<u-field label="商家名称" placeholder="请输入商家名称" label-width="180" v-model="shopInfo.name" disabled></u-field>
 			<u-cell-item title="请上传商家图标" :arrow="false">
 				<view slot="label">
+					<image class="shop-img" :src="item.url" v-for="(item, index) in defaultList1" :key="index" v-if="!edit"></image>
 					<u-upload :action="uploadUrl" :file-list="defaultList1" :form-data="uploadData" @on-success="logoUploadSuccess"
-					 @on-error="uploadError" max-count="1"></u-upload>
+					 @on-error="uploadError" max-count="1" v-if="edit"></u-upload>
 				</view>
 			</u-cell-item>
-			<u-cell-item :title="'请上传店铺主图（' + fileList.length + '/3）'" :arrow="false">
+			<u-cell-item :title="'请上传店铺主图（' + defaultList2.length + '/3）'" :arrow="false">
 				<view slot="label">
+					<image class="shop-img" :src="item.url" v-for="(item, index) in defaultList2" :key="index" v-if="!edit"></image>
 					<u-upload :action="uploadUrl" :file-list="defaultList2" :form-data="uploadData" @on-success="uploadSuccess"
-					 @on-error="uploadError" @on-remove="uploadRemove" max-count="3"></u-upload>
+					 @on-error="uploadError" @on-remove="uploadRemove" max-count="3" v-if="edit"></u-upload>
 				</view>
 			</u-cell-item>
 			<u-cell-item title="请上传身份证正反面" :arrow="false">
@@ -221,6 +223,13 @@
 				color: #333333;
 			}
 
+			.shop-img {
+				width: 90px;
+				height: 90px;
+				float: left;
+				margin-right: 10px;
+			}
+
 			.id-card-box {
 				display: flex;
 
@@ -263,6 +272,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 
 			// /deep/.u-btn--success--disabled {

pagesMedia/liveOption.vue

@@ -199,7 +199,7 @@
 						}, 1000)
 					}).catch(res => {
 						this.$refs.uTips.show({
-							title: '新增直播设置失败',
+							title: res.data.msg,
 							type: 'warning',
 						})
 					})
@@ -220,7 +220,7 @@
 						}, 1000)
 					}).catch(res => {
 						this.$refs.uTips.show({
-							title: '编辑直播设置失败',
+							title: res.data.msg,
 							type: 'warning',
 						})
 					})
@@ -272,6 +272,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMedia/videoDetail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<view class="video-box" @click="popupShow = true">
+		<view class="video-box">
 			<video id="myVideo" class="my-video" :src="videoUrl" @error="videoErrorCallback" controls></video>
 		</view>
 		<view class="popup-open" @click="popupShow = true">
@@ -44,6 +44,8 @@
 		onLoad(options) {
 			this.videoId = options.videoId
 			this.videoUrl = uni.getStorageSync("videoUrl")
+		},
+		onShow() {
 			NET.request(API.getVideoBindGoods, {
 				videoId: this.videoId
 			}, 'GET').then(res => {

pagesMedia/videoForm.vue

@@ -55,6 +55,9 @@
 					</view>
 				</view>
 			</scroll-view>
+			<view class="good-select-custom-box">
+				<u-button type="success" shape="circle" :ripple="true" @click="popupShow = false" class="good-select-custom">确认</u-button>
+			</view>
 		</u-popup>
 		<u-top-tips ref="uTips"></u-top-tips>
 	</view>
@@ -309,6 +312,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 
@@ -320,6 +331,20 @@
 			padding: 40px 0 10px 0;
 		}
 
+		.good-select-custom-box {
+			width: calc(100% - 30px);
+			margin: 10px 15px;
+			float: left;
+
+			.good-select-custom {
+				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+			}
+		}
+
 		.select-good-row {
 			width: 100%;
 			height: 114px;