Merge branch 'master' of http://39.101.143.165:8090/hxl13994548489/LocalLivingServicesUniapp

manifest.json

@@ -2,8 +2,8 @@
     "name" : "掌柜生活商户版",
     "appid" : "__UNI__E0EA6E1",
     "description" : "",
-    "versionName" : "1.1.5.3",
-    "versionCode" : 1153,
+    "versionName" : "1.1.5.6",
+    "versionCode" : 1156,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/coupon/creatcoupon.vue

@@ -429,9 +429,11 @@ export default {
 			} else {
 				let temp = []
 				console.log(this.xqImage)
+					
 				if ( this.xqImage.length > 0) {
 					this.xqImage.forEach((item => {
-						temp.push( configService.apiUrl +'/'+item.response.message)
+						// temp.push( configService.apiUrl +'/'+item.response.message)
+						temp.push(item.url)
 					}))
 				}
 				
@@ -453,6 +455,11 @@ export default {
 							uni.navigateTo({
 								url: '/pages/coupon/coupon'
 							})
+						}else{
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							});
 						}
 					})
 				} else {
@@ -468,6 +475,11 @@ export default {
 								url: '/pages/coupon/coupon'
 							})
 
+						}else{
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none'
+							});
 						}
 					})
 				}

pages/groupMeal/orders/refund.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="record">
+		<view class="top"></view>
 		<u-navbar title="协商记录" :autoBack="true" :placeholder="true" :border-bottom="true"></u-navbar>
 		<view class="product">
 			<view class="left">
@@ -59,7 +60,9 @@
 				</view>
 				<view class="">
 					<view class="information">
-						拒绝原因：{{ data.refuseReason && reasonList.find(item => item.value == data.refuseReason).label }}
+						拒绝原因：
+						{{ data.refuseReason ==0?'商品已使用':'商品已核销' }}
+						<!-- {{ data.refuseReason && reasonList.find(item => item.value == data.refuseReason).label }} -->
 					</view>
 					<view class="information">
 						补充说明：{{ data.refuseReasonExplain }}
@@ -120,16 +123,7 @@ export default {
 		return {
 			data: {},
 			query: {},
-			reasonList: [
-				{
-					name: '商品已使用',
-					check: false,
-				},
-				{
-					name: '服务已核销',
-					check: false,
-				}
-			],
+			reasonList: [],
 			isRefuse: false,
 			rejectData: {
 				refuseReason: '',
@@ -165,6 +159,7 @@ export default {
 		},
 		// 选择拒绝原因
 		onSelect(item, index) {
+			console.log(item.value)
 			this.reasonList.forEach(reason => {
 				reason.check = false;
 			});
@@ -236,6 +231,12 @@ export default {
 	background: #F7F8FC;
 	display: flex;
 	flex-direction: column;
+	/*#ifdef APP-PLUS*/
+	.top {
+		width: 100%;
+		height: var(--status-bar-height);
+	}
+	/*  #endif  */
 
 	.product {
 		display: flex;

pages/index/userControl.vue

@@ -20,7 +20,15 @@
 		</view>
 		<mescroll-uni class="list" :fixed="false" ref="mescrollRef" @up="getNewList" @init="mescrollInit" :use="false"
 			v-if="currentIndex == 0">
-
+			<view class="item" v-for="(item,index) in newList" :key="index">
+				<view class="img">
+					<image :src="item.userAvatar?item.userAvatar:'/static/product/user.png'" mode=""></image>
+				</view>
+				<view class="right">
+					{{item.nickName}}<br />
+					<span>{{item.phone}}</span>
+				</view>
+			</view>
 		</mescroll-uni>
 		<mescroll-uni class="list" :fixed="false" ref="mescrollRef" @up="getAllList" @init="mescrollInit" :use="false"
 			v-if="currentIndex == 1">

pages/product/creatProduct.vue

@@ -189,7 +189,7 @@
 							售卖时间<span>*</span>
 						</view>
 						<view class="picker set inp" @click="selectDate">
-							<u-input class="form-input" :disabled="true" placeholder="去设置" v-model="showDate" @click="selectDate" />
+							<u-input class="form-input" readonly placeholder="去设置" v-model="showDate" @click="selectDate" />
 							<u-icon name="arrow-right" style="margin-left: 17rpx;"></u-icon>
 						</view>
 					</view>
@@ -480,7 +480,7 @@
 					})
 					// this.form.specItems = temp
 				}
-				
+
 				//基础信息必填提示
 				if (!this.form.categoryId) {
 					uni.showToast({
@@ -510,14 +510,16 @@
 					});
 					return
 				}
-				if (!this.form.price && !this.form.categoryId == '1945013773786701826') {
+				if (!this.form.price) {
+				// if (!this.form.price && !this.form.categoryId == '1945013773786701826') {
 					uni.showToast({
 						title: '请输入商品原价',
 						icon: 'none'
 					});
 					return
 				}
-				if (!this.form.soldPrice && !this.form.categoryId == '1945013773786701826') {
+				// if (!this.form.soldPrice && !this.form.categoryId == '1945013773786701826') {
+				if (!this.form.soldPrice) {
 					uni.showToast({
 						title: '请输入商品售价',
 						icon: 'none'
@@ -712,8 +714,8 @@
 				this.showGroupPicker = false;
 			},
 			selectDate() {
-				this.isSelectDate = true
-				// this.$refs.rangTime.open()
+				// this.isSelectDate = true
+				this.$refs.rangTime.open()
 			},
 			onEndTimeChange(val) {
 				this.form.saleStartDate = val.startDate
@@ -828,7 +830,7 @@
 
 						this.showDate = res.data.result.saleStartDate.slice(0, 10) + ' ~ ' + res.data.result.saleEndDate.slice(0,
 							10)
-						if (res.data.resultuseType == 2) {
+						if (res.data.result.useType == 2) {
 							this.showSellDate = res.data.result.availableStartDate.slice(0, 10) + '-' + res.data.result
 								.availableEndDate.slice(0, 10)
 						} else if (res.data.result.useType == 1) {