Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-shell-uniapp

.gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+unpackage/

config/api.js

@@ -79,6 +79,8 @@ module.exports = {
 	getLogisticsDeatil: WX_API_BASE + 'app/order/getShippingTrace/',
 	//  回复订单评价
 	evaluateOrder: WX_API_BASE + 'app/order/merchant/my/orderList/updateOrderEvaluateByReply',
+	//  发布留言
+	addMessage: WX_API_BASE + 'app/order/user/my/orderList/orderDetail/leaMsgList/addLeaMsg',
 	//  获取订单详情
 	getOrderDetail: WX_API_BASE + 'app/order/user/my/orderList/orderDetail',
 

pages.json

@@ -125,12 +125,12 @@
 		}, {
 			"path": "couponForm",
 			"style": {
-				"navigationBarTitleText": "我的优惠卷"
+				"navigationBarTitleText": "我的优惠券"
 			}
 		}, {
 			"path": "couponList",
 			"style": {
-				"navigationBarTitleText": "发放优惠卷"
+				"navigationBarTitleText": "发放优惠券"
 			}
 		}, {
 			"path": "authorizeList",

pages/index/register.vue

@@ -8,7 +8,7 @@
 					 @on-error="uploadError" max-count="1"></u-upload>
 				</view>
 			</u-cell-item>
-			<u-cell-item title="请上传店铺主图（0/3）" :arrow="false" class="all-width">
+			<u-cell-item :title="`请上传店铺主图（${fileList.length}/3）`" :arrow="false" class="all-width">
 				<view slot="label">
 					<u-upload :action="uploadUrl" :file-list="defaultList2" :form-data="uploadData" @on-success="uploadSuccess"
 					 @on-error="uploadError" @on-remove="uploadRemove" max-count="3"></u-upload>

pages/index/registerState.vue

@@ -5,7 +5,7 @@
 				<view class="status-line"></view>
 				<u-icon name="checkmark-circle-fill" class="icon" color="#52A63A" size="32"></u-icon>
 				<view class="status-title">已注册</view>
-				<text class="status-date">{{registerInfo.effectTime}}</text>
+				<text class="status-date">{{registerInfo.applyTime ? registerInfo.applyTime : ' '}}</text>
 			</view>
 			<view class="status-row">
 				<view class="status-line"></view>
@@ -17,7 +17,7 @@
 				<view class="status-line"></view>
 				<u-icon name="checkmark-circle-fill" class="icon" color="#52A63A" size="32" v-if="registerInfo.auditState == 2"></u-icon>
 				<u-icon name="close-circle-fill" class="icon" color="#FF4545" size="32" v-else></u-icon>
-				<view class="status-title">{{registerInfo.auditState == 2 ? '审核已通过' : '审核未通过'}}</view>
+				<view class="status-title">{{registerInfo.auditState == 2 ? '审核已通过' : '审核未通过:'+registerInfo.rejectReason}}</view>
 				<text class="status-date">{{registerInfo.auditTime}}</text>
 			</view>
 		</view>
@@ -40,6 +40,7 @@
 					applyTime: '',
 					auditTime: '',
 					effectTime: '',
+					rejectReason: ''
 				},
 			}
 		},

pages/user/index.vue

@@ -34,7 +34,7 @@
 				<view class="item-btn-text">自助采摘</view>
 				<view class="iconfont iconfangxiang"></view>
 			</view>
-			<view class="item-btn" @click="authorizeClick()">
+			<view class="item-btn" @click="authorizeClick()" v-if="userData.isMaster">
 				<view class="iconfont iconguanyu item-btn-icon"></view>
 				<view class="item-btn-text">授权</view>
 				<view class="iconfont iconfangxiang"></view>
@@ -78,6 +78,7 @@
 					userId: '',
 					userName: '',
 					headImage: '',
+					isMaster: 0,
 				},
 				manageInfo: {},
 				modalShow: false
@@ -85,6 +86,7 @@
 		},
 		onLoad() {
 			this.userData = uni.getStorageSync("userData")
+			console.log('是否授权', this.userData.isMaster)
 			NET.request(API.getManageInfo, {}, 'POST').then(res => {
 				this.manageInfo = res.data
 			}).catch(error => {

pagesMain/couponForm.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<u-cell-group class="form-info" :border="false">
-			<u-field label="优惠卷名称" placeholder="请输入优惠卷名称" label-width="180" v-model="couponInfo.couponName"></u-field>
+			<u-field label="优惠券名称" placeholder="请输入优惠券名称" label-width="180" v-model="couponInfo.couponName"></u-field>
 			<u-field label="条件金额" placeholder="请输入条件金额" label-width="180" v-model="couponInfo.fullAmount"></u-field>
 			<u-field label="减免金额" placeholder="请输入减免金额" label-width="180" v-model="couponInfo.discountAmount"></u-field>
 			<u-field label="有效期（天）" placeholder="请输入有效期（天）" label-width="180" v-model="couponInfo.term"></u-field>

pagesMain/couponList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="coupon-title">
-			<view class="title-text">已发放的优惠卷</view>
+			<view class="title-text">已发放的优惠券</view>
 		</view>
 		<view class="coupon-row" v-for="(item, index) in couponList" :key="index">
 			<view class="coupon-left">
@@ -19,7 +19,7 @@
 			<u-loading mode="circle" v-if="loadingData"></u-loading>{{loadingData ? '加载中' : (isOver ? '没有更多了' : '点击加载更多')}}
 		</u-divider>
 		<view class="form-handle">
-			<u-button type="success" shape="circle" :ripple="true" @click="addCoupon" class="handle-custom">发放优惠卷</u-button>
+			<u-button type="success" shape="circle" :ripple="true" @click="addCoupon" class="handle-custom">发放优惠券</u-button>
 		</view>
 		<u-top-tips ref="uTips"></u-top-tips>
 	</view>

pagesMain/logisticsDeatil.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="express-info">
 			<view class="express-text">物流公司：{{expressData.company}}</view>
-			<view class="express-text">物流单号：{{expressData.logisticCode}}</view>
+			<view class="express-text">物流单号：{{expressData.logisticCode ? expressData.logisticCode : ''}}</view>
 		</view>
 		<view class="express-list">
 			<uni-steps :options="expressList" active-color="#008AFF" direction="column" :active="0"></uni-steps>
@@ -29,12 +29,16 @@
 					company: '顺丰',
 					logisticCode: res.data.logisticCode,
 				}
-				this.expressList = res.data.traces && res.data.traces.map(site => {
-					return {
-						title: site.acceptStation,
-						desc: site.acceptTime
-					}
-				})
+				if (res.data.traces.length) {
+			      this.expressList = res.data.traces && res.data.traces.map(site => {
+			      	return {
+			      		title: site.acceptStation,
+			      		desc: site.acceptTime
+			      	}
+			      })
+				} else {
+				    this.expressList = [{title: ' ', desc: '暂无物流信息'}]
+				}
 			}).catch(error => {
 				console.log('物流追踪',error)
 				this.$refs.uTips.show({

pagesMain/messageForm.vue

@@ -79,6 +79,7 @@
 						uni.navigateBack()
 					}, 1000)
 				}).catch(error => {
+					console.log(error)
 					this.$refs.uTips.show({
 						title: error.data.msg,
 						type: 'warning',

pagesMain/orderDetail.vue

@@ -43,7 +43,7 @@
 				<u-cell-group :border="false">
 					<u-cell-item title="商品金额" :value="'￥' + orderData.orderSum" :arrow="false" :border-bottom="false"></u-cell-item>
 					<u-cell-item title="积分抵扣" :value="'-￥' + orderData.integralAmount" :arrow="false" :border-bottom="false" v-if="goodType == 1"></u-cell-item>
-					<u-cell-item title="优惠卷" :value="'-￥' + orderData.couponDiscountAmount" :arrow="false" :border-bottom="false" v-if="goodType == 1"></u-cell-item>
+					<u-cell-item title="优惠券" :value="'-￥' + orderData.couponDiscountAmount" :arrow="false" :border-bottom="false" v-if="goodType == 1"></u-cell-item>
 					<u-cell-item title="备注" :value="orderData.notes" :arrow="false" :border-bottom="false"></u-cell-item>
 				</u-cell-group>
 			</view>
@@ -156,13 +156,13 @@
 				} else {
 					this.buttonGroup = []
 				}
+				this.getOrderType()
 			}).catch(error => {
 				this.$refs.uTips.show({
 					title: error.data.msg,
 					type: 'warning',
 				})
 			})
-			this.getOrderType()
 		},
 		onShow() {},
 		methods: {