经营信息bug修复

manifest.json

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

pages/login/settled.vue

@@ -19,7 +19,7 @@
 				<view :class="tab == '3' ? 'color' : ''">门店信息</view>
 			</view>
 		</view>
-		<status v-else :status="form.status" :updateTime="form.updateTime" :remark="form.remark"></status>
+		<status v-else :status="form.status" :reason="form.reason" :updateTime="form.updateTime" :remark="form.remark"></status>
 		<view v-if="tab == 1" :class="title == '申请入驻'?'tab-top':''">
 			<form>
 

pages/store/addHours.vue

@@ -13,14 +13,19 @@
                     {{ tag }}
                 </view>
             </view>
-            <view style="padding-top:18upx">营业时段</view>
+						<view class="" style="display: flex;justify-content: space-between;align-items: center;">
+							 <view style="padding-top:18upx">营业时段</view>
+							 <view @click="add()" class="add-style">添加</view>
+						</view>
+           
+						
             <view class="cu-form-group" style="border-bottom: 1upx solid #eee;margin:0" v-if="timeType.length > 0">
                 <input v-model="time" name="input"></input>
             </view>
             <view style="border-bottom: 1upx solid #eee;margin:0" v-for="(tim, timInd) in timeArr" :key="timInd" v-else>
                 <view class="cu-form-group" style="margin:0" v-if="timInd == 0 && timeArr.length < 3">
                     <input placeholder="添加营业时段（1/3）" v-model="tim.value" name="input" @click="open(timInd)" disabled="true"></input>
-                    <view @click="add()" class="add-style">添加</view>
+                    <text class='cuIcon-right' style="color: #C7C6CA ;" @click="open(timInd)"></text>
                 </view>
                 <view v-else>
                     <uni-swipe-action>
@@ -216,6 +221,8 @@ export default {
         },
         onEndTimeChange(val) {
             this.timeArr[this.timeIndex].value = val.startDate + '-' + val.endDate
+						this.$refs.rangTime.startDate = ''
+						this.$refs.rangTime.endDate = ''
 
         },
         sumbit() {

pages/store/businessInfor.vue

@@ -78,7 +78,7 @@
 		</view>
 		<view class="padding flex sub-bottom">
 			<button class="cu-btn round line-gray  shadow" @click="$Router.push({ name: 'settings' })">取消</button>
-			<button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round " @click.native="sumbit">提交审核</button>
+			<button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round " @click.native="sumbit">提交</button>
 		</view>
 		<u-picker v-model="show" mode="time" @confirm="selectTime" style="z-index: 999 !important;"></u-picker>
 	</view>

pages/store/components/status.vue

@@ -29,7 +29,7 @@
                 </view>
                 <!-- <text style="color: #999;">{{updateTime }}</text> -->
             </view>
-            <view>驳回原因：{{ remark }}{{updateTime }} </view>
+            <view>驳回原因：{{ remark }}<br/>补充说明：{{reason}}<br/>审批时间：{{updateTime }} </view>
         </view>
     </view>
 </template>
@@ -40,6 +40,10 @@ export default {
             type: Number,
             default: null
         },
+				reason: {
+				    type: String,
+				    default: null
+				},
         updateTime: {
             type: String,
             default: ''