前端

uni_merchants_enter/manifest.json

@@ -50,11 +50,17 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx5d8906c2208c899f",
         "setting" : {
             "urlCheck" : false
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "为用户提供给接送服务，需要定位信息"
+            }
+        },
+		"requiredPrivateInfos" : [ "getLocation", "chooseLocation", "chooseAddress" ]
     },
     "mp-alipay" : {
         "usingComponents" : true

uni_merchants_enter/pageA/enter/cateringindustry.vue

@@ -15,7 +15,7 @@
 					</u-upload>
 				</u-form-item>
 				<u-form-item  labelWidth='150' labelPosition='left' label="经营许可证有效期">
-					<view style='text-align:right;' @click='openjyxkz'>选择日期<image src="@/static/image/yjt.png" mode=""
+					<view style='text-align:right;' @click='openjyxkz'>{{form.operateCertificateDate?form.operateCertificateDate:'选择日期'}}<image src="@/static/image/yjt.png" mode=""
 								style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image></view>
 				</u-form-item>
 				<uni-calendar
@@ -32,7 +32,7 @@
 						<u-input inputAlign='right' border='none' placeholder='输入经营者姓名' v-model="form.operater" />
 					</u-form-item>
 					<u-form-item  labelWidth='150' labelPosition='left' label="经营者手机号">
-						<u-input inputAlign='right' border='none' placeholder='输入经营者手机号' v-model="form.operaterPhone" />
+						<u-input inputAlign='right' maxlength="15" border='none' placeholder='输入经营者手机号' v-model="form.operaterPhone" />
 					</u-form-item>
 					<u-form-item  labelWidth='150' labelPosition='left' label="验证码">
 						<u-input inputAlign='right' border='none' placeholder='输入验证码' v-model="form.verifyCode" >
@@ -51,7 +51,7 @@
 						<u-input inputAlign='right' border='none' placeholder='输入联系人姓名' v-model="form.contacts" />
 					</u-form-item>
 					<u-form-item  labelWidth='150' labelPosition='left' label="业务联系电话(选填)">
-						<u-input inputAlign='right' border='none' placeholder='输入联系电话' v-model="form.contactsPhone" />
+						<u-input inputAlign='right' maxlength="15" border='none' placeholder='输入联系电话' v-model="form.contactsPhone" />
 					</u-form-item>
 					<u-form-item labelWidth='80' labelPosition='left' @click='placeSelect(),hideKeyboard()' label="店铺位置">
 						<view style='text-align:right;' v-if="form.province">{{ form.province }}{{ form.city }}{{ form.area }}</view>
@@ -62,12 +62,13 @@
 						</view>
 					</u-form-item>
 					<u-form-item labelWidth='80' labelPosition='left' label="详细地址">
-						<u-input inputAlign='right' border='none' placeholder='输入详细地址，不超过15个字' v-model="form.detailedAddress" />
+						<u-input inputAlign='right' maxlength="15" border='none' placeholder='输入详细地址，不超过15个字' v-model="form.detailedAddress" />
 					</u-form-item>
 					<u-form-item  labelWidth='150' labelPosition='left' label="营业时间">
-						<view @click='selectTime'>111111{{}}</view>
+						<view style='text-align:right;' @click='selectTime'>{{form.timesection}}<image src="@/static/image/yjt.png" mode=""
+								style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image></view>
 					</u-form-item>
-					<smh-time-range :is-under='show' :time="['12','30','0','17','30']" @confrim="confrim" @cancel="cancel"></smh-time-range>
+					<smh-time-range :is-under='show' :time="['18','0','42']" @confrim="confrim" @cancel="cancel"></smh-time-range>
 					<!-- label -->
 					<view class='flex justify-space-between align-item-center'>
 						<view>标签（2-4个，最多5个字）</view> 
@@ -76,11 +77,11 @@
 					<view style='flex-wrap: wrap;' class='flex'>
 						<view style='margin:10rpx;width:47%;' class='flex align-item-center' v-for='item in labelList'>
 							<u-input inputAlign='right' placeholder='输入标签文字' v-model="item.value" />
-							<view class="iconfont_no icon_merchants_enterjian1"></view>
+							<view class="iconfont_no icon_merchants_enterjianshao"></view>
 						</view>
 					</view>
 					
-				<u-form-item labelWidth='120' labelPosition='top' label="门面及门头照片(1张,店名文字清晰)">
+				<u-form-item labelWidth='240' labelPosition='top' label="门面及门头照片(1张,店名文字清晰)">
 					<u-upload :fileList="fileList4" @afterRead="afterRead($event,3)" @delete="deletePic" name="4" multiple
 						:maxCount="1">
 						
@@ -97,14 +98,19 @@
 				<button @click='submit' class="submit">提交</button>
 			</view>
 		</view>
+		<u-modal :show="isSubmit" :content='content' @confirm="$u.debounce(confirmSubmit, 500)" showCancelButton
+			@cancel="isSubmit=false" @close="isSubmit=false" closeOnClickOverlay></u-modal>
 	</view>
 </template>
 
 <script>
 	var that
+	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
 		data() {
 			return {
+				content:'确定提交入驻信息',
+				isSubmit:false,
 				form:{
 					mainBody:'商铺',
 					lookFlag:0,
@@ -117,8 +123,13 @@
 					businessLicense:'',
 					operateCertificate:'',
 					coverImage:'',
-					indoorImage:''
+					indoorImage:'',
+					timesection:'09:00~21:00',
+					startDate:'09:00',
+					endDate:'21:00',
+					operateCertificateDate:'',
 				},
+				
 				tips:'发送验证码',
 				startDate:'',
 				show:false,
@@ -140,6 +151,70 @@
 			
 		},
 		methods: {
+			submit(){
+				this.isSubmit = true
+			},
+			confirmSubmit() {
+				if(this.labelList.length>0){
+					var arr=[]
+					for(var i=0;i<this.labelList.length;i++){
+						if(!this.labelList[i].value){
+							uni.showToast({
+								icon: "none",
+								title: '标签请输入内容！',
+								duration: 3000
+							});
+							return
+						}
+						if(this.labelList[i].value.length>5){
+							uni.showToast({
+								icon: "none",
+								title: '标签最多5个字！',
+								duration: 3000
+							});
+							return
+						}
+						arr.push(this.labelList[i].value)
+					}
+					this.form.label=arr.toString()
+				}
+				
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.$request.baseRequest('admin.tourism.foodInfo', 'add', {
+					foodInfo: JSON.stringify(this.form)
+				}, failres => {
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
+			
+					uni.hideLoading()
+				}).then(res => {
+					this.isSubmit = false
+					uni.showToast({
+						icon: "success",
+						title: '提交成功，请等待平台审核',
+						duration: 2000
+					});
+					uni.navigateBack()
+			
+				})
+			},
+			concel(e){
+				this.show=false
+				console.log(e)
+			},
+			confrim(e){
+				console.log(e)
+				this.show=false
+				this.form.timesection=e.time
+				this.form.startDate=e.start
+				this.form.endDate=e.end
+			},
 			selectTime(){
 				this.show=true
 			},
@@ -201,6 +276,7 @@
 			},
 			confirm(e){
 				this.form.operateCertificateDate = e.fulldate
+				this.$forceUpdate()
 				console.log(e)
 			},
 			openjyxkz(){
@@ -280,9 +356,10 @@
  .wrap{
 	 padding:20rpx;
  }
- .icon_merchants_enterjian1{
+ .icon_merchants_enterjianshao{
 	 margin-left:10rpx;
 	 font-size:50rpx;
+	 color:#666;
  }
  .add_label,.get_code{
 

uni_merchants_enter/style/icon/iconfont.css

@@ -1,9 +1,9 @@
 @font-face {
   font-family: "iconfont_no"; /* Project id 4108869 */
-  src: url('//at.alicdn.com/t/c/font_4108869_h2yk92nghsb.woff2?t=1686115283298') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4108869_h2yk92nghsb.woff?t=1686115283298') format('woff'),
-       url('//at.alicdn.com/t/c/font_4108869_h2yk92nghsb.ttf?t=1686115283298') format('truetype'),
-       url('//at.alicdn.com/t/c/font_4108869_h2yk92nghsb.svg?t=1686115283298#iconfont_no') format('svg');
+  src: url('//at.alicdn.com/t/c/font_4108869_ntpjbi3tz9.woff2?t=1686127618358') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4108869_ntpjbi3tz9.woff?t=1686127618358') format('woff'),
+       url('//at.alicdn.com/t/c/font_4108869_ntpjbi3tz9.ttf?t=1686127618358') format('truetype'),
+       url('//at.alicdn.com/t/c/font_4108869_ntpjbi3tz9.svg?t=1686127618358#iconfont_no') format('svg');
 }
 
 .iconfont_no {
@@ -14,6 +14,6 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon_merchants_enterjian1:before {
-  content: "\e600";
+.icon_merchants_enterjianshao:before {
+  content: "\e8b1";
 }

uni_merchants_enter/uni_modules/smh-time-range/components/smh-time-range/smh-time-range.vue

@@ -8,6 +8,10 @@
 				<text  @tap="cancel">取消</text>
 				<text @tap="confirm">确定</text>
 			</view>
+			<view style='display: flex;justify-content: space-between;margin:0 38px;'>
+				<view>开始时间</view>
+				<view>结束时间</view>
+			</view>
 			<picker-view class="picker" :value="value" @change="getime" indicator-style="height:30px;">
 				<picker-view-column>
 					<view class="hours" style="line-height:30px; text-align: center;" v-for="(item,index) in hoursList" :key="index">{{item}}</view>
@@ -35,7 +39,7 @@
 			time:{
 				type: Array,
 				default() {
-					return ['15','0','0','18','0'];
+					return ['15','0','0'];
 				}
 			},
 			isUnder: {
@@ -109,18 +113,22 @@
 		},
 		methods:{
 			confirm(){
-				let time = this.value[0]+"-"+this.value[1]
-				this.$emit("confrim",{time:time})
+				setTimeout(()=>{
+					console.log(this.value)
+					let time = this.value[0]+"~"+this.value[1]
+					this.$emit("confrim",{time:time,start:this.value[0],end:this.value[1]})
+				},100)
+				
 			},
 			cancel(){
-				let time = this.value[0]+"-"+this.value[1]
-				this.$emit("cancel",{time:time})
+				let time = this.value[0]+"~"+this.value[1]
+				this.$emit("cancel",{time:time,start:this.value[0],end:this.value[1]})
 			},
 			getime(e){
 				let val = e.detail.value
+				console.log(val,val[0],val[1],val[2])
 				this.value[0] = this.hoursList[val[0]] 
-				this.value[1] = this.hoursList[val[1]] 
-				this.value[2] = val[2]
+				this.value[1] = this.hoursList[val[2]] 
 			},
 		}
 	}