Merge branch 'master' of http://git.zthymaoyi.com/zyw/tourism

# Conflicts:
#	uni_applet/pages/food/food.vue

uni_applet/App.vue

@@ -41,7 +41,7 @@
 	.caution{
 		color:red;
 	}
-	.footer{
+	.footer,.mercharts_footer{
 		position:fixed;
 		bottom:0;
 		left:0;
@@ -55,6 +55,11 @@
 			width:90%;
 		}
 	}
+	.mercharts_footer{
+			.submit{
+				background:#5F7DE9;
+			}
+		}
 	.flex{
 		display:flex;
 	}

uni_applet/components/text-over-flow/text-over-flow.vue

@@ -2,17 +2,17 @@
   <view>
     <view style="position: relative" v-if="isHide">
       <view class="dt-content" :style="'-webkit-line-clamp:'+line">
-        <text class="content">
+        <text class="text-overflow-content">
           <slot>{{ dt ? dt : '' }}</slot>
         </text>
       </view>
       <view class="button-show" @tap="isHide = false" v-if="enableButton&&lines>line">
-        <text style="color: #C82229">{{ expandText }}</text>
+        <text style="color: #E95700 ;">{{ expandText }}</text>
       </view>
     </view>
     <view v-else>
       <view>
-        <text class="content">
+        <text class="text-overflow-content">
           <slot>{{ dt ? dt : '' }}</slot>
         </text>
       </view>
@@ -88,7 +88,7 @@ export default {
     if (this.enableButton) {
       let query = uni.createSelectorQuery().in(this);
       // 获取所有文本在html中的高度
-      query.select('.content').boundingClientRect(data => {
+      query.select('.text-overflow-content').boundingClientRect(data => {
         this.textHeight = data.height
       }).exec();
 
@@ -106,6 +106,7 @@ export default {
       if (!this.enableButton) {
         return this.line
       }
+	  // console.log(this.line,this.textHeight,this.lineHeight, Math.floor( this.textHeight / this.lineHeight ),11111111)
       return Math.floor(this.textHeight > 0 && this.lineHeight > 0 ? this.textHeight / this.lineHeight : 0)
     }
   }
@@ -132,7 +133,7 @@ export default {
 }
 
 .fold-hint {
-  color: #C82229;
+  color: #E95700;
   text-align: right
 }
 </style>

uni_applet/pageA/enter/cateringindustry.vue

@@ -94,7 +94,7 @@
 					</u-upload>
 				</u-form-item>
 			</u--form>
-			<view class="footer">
+			<view class="mercharts_footer">
 				<button @click='submit' class="submit">提交</button>
 			</view>
 		</view>

uni_applet/pageA/enter/homestay.vue

@@ -52,7 +52,7 @@
 				</u-form-item>
 				<u-form-item>
 					<view class="flex service align-center">
-						<view @click='' :class='consentStatus?"icon_merchants_entergouxuan":"icon_merchants_enterweigouxuan"' class="iconfont_no"></view>
+						<view @click='consentStatus=!consentStatus' :class='consentStatus?"icon_merchants_entergouxuan":"icon_merchants_enterweigouxuan"' class="iconfont_no"></view>
 						我已阅读并同意
 						<navigator
 							url="/pageA/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
@@ -60,7 +60,7 @@
 					</view>
 				</u-form-item>
 			</u--form>
-			<view class="footer">
+			<view class="mercharts_footer">
 				<button @click='submit' class="submit">提交</button>
 			</view>
 			<u-modal :show="isSubmit" :content='content' @confirm="$u.debounce(confirmSubmit, 500)" showCancelButton
@@ -162,7 +162,7 @@
 				}).then(res => {
 					this.isSubmit = false
 					uni.showToast({
-						icon: "success",
+						icon: "none",
 						title: '提交成功，请等待平台审核',
 						duration: 2000
 					});

uni_applet/pageA/enter/myCateringdustry/addGroupBuying.vue

@@ -119,7 +119,7 @@
 				</u-form-item>
 			</u--form>
 			<view>备注：如部分菜品因时令或其他不可抗因素导致无法提供，商家可用等价菜品替换，具体事宜与顾客协商决定。</view>
-			<view class="footer">
+			<view class="mercharts_footer">
 				<button @click='next' class="submit">下一步</button>
 			</view>
 			<u-calendar @close='show = false' @confirm="confirm" :show="show"></u-calendar>

uni_applet/pageA/enter/myCateringdustry/addGroupBuyingNext.vue

@@ -74,7 +74,7 @@
 				</view>
 			</view>
 		</u-modal>
-		<view class="footer">
+		<view class="mercharts_footer">
 			<button @click='submit' class="submit">提交</button>
 		</view>
 	</view>

uni_applet/pageA/enter/myCateringdustry/addfood.vue

@@ -43,7 +43,7 @@
 					</u-upload>
 				</u-form-item>
 			</u--form>
-			<view class="footer">
+			<view class="mercharts_footer">
 				<button @click='submit' class="submit">提交</button>
 			</view>
 		</view>

uni_applet/pageA/enter/myHomestay/add.vue

@@ -1,22 +1,413 @@
 <template>
-	<view>
-		
+	<view class='content'>
+		<view class='wrap'>
+			<u--form labelPosition="left" :model="form"  ref="uForm">
+				<u-form-item labelWidth='240' labelPosition='top' label="上传民宿图片">
+					<u-upload :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic" name="1" multiple
+						:maxCount="20">
+					</u-upload>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='top' label="标题">
+					<u--input minlength='6' maxlength='30' inputAlign='right' v-model="form.title" placeholder="输入标题,6-30个字" border="none"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth='150' labelPosition='top' label="详细介绍（选填）">
+					<u--textarea maxlength='1000'  v-model="form.detailedIntroduction" autoHeight placeholder="输入房源介绍，0-1000个字" ></u--textarea> 
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="单价（元/晚）">
+					<u--input inputAlign='right' v-model="form.price" placeholder="输入单价" border="none"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="户型">
+					<view class='flex'>
+						<view class='flex'>
+							<u--input inputAlign='right' v-model="room" placeholder="输入" border="none"></u--input>
+							<view>室</view>
+						</view>
+						<view class='flex'>
+							<u--input inputAlign='right' v-model="hall" placeholder="输入" border="none"></u--input>
+							<view>厅</view>
+						</view>
+						<view class='flex'>
+							<u--input inputAlign='right' v-model="toilet" placeholder="输入" border="none"></u--input>
+							<view>卫</view>
+						</view>
+					</view>
+					
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="床铺数量">
+					<u--input inputAlign='right' v-model="form.bedNum" placeholder="输入床铺数量" border="none"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="最多可住人数">
+					<u--input inputAlign='right' v-model="form.mostPeople" placeholder="输入最多可住人数" border="none"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' label="面积（平米）">
+					<u--input inputAlign='right' v-model="form.decorationArea" placeholder="输入房屋面积" border="none"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='left' @click='placeSelect(),hideKeyboard()' label="房源位置">
+					<view style='text-align:right;' v-if="form.province">{{ form.province }}{{ form.city }}{{ form.area }}</view>
+					<view style='text-align:right;' v-else>
+						<text style='text-align:right;'>选择房源位置 </text>
+						<image src="@/static/image/yjt.png" mode=""
+							style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image>
+					</view>
+				</u-form-item>
+				<u-form-item labelWidth='80' labelPosition='left' label="详细地址">
+					<u-input inputAlign='right' maxlength="15" border='none' placeholder='输入详细地址，不超过15个字' v-model="form.detailedAddress" />
+				</u-form-item>
+				<u-form-item labelWidth='120' labelPosition='top' label="房源特色">
+					<view class="flex">
+						<u--input v-for='item in labelList' inputAlign='right' v-model="item.value" placeholder="输入房源特色" border="none"></u--input>
+					</view>
+					
+				</u-form-item>
+			</u--form>
+			<view>
+				<view class='flex justify-space-between'>
+					<view style='width:25%;'>服务</view>
+					<view style='width:25%;'></view>
+					<view style='width:25%;'></view>
+					<view class='checkall'>
+						<u-checkbox-group
+						            v-model="checkboxValue1"
+						            placement="column"
+						            @change="checkboxChange1"
+						        >
+						            <u-checkbox
+						                :customStyle="{marginBottom: '8px'}"
+						                :checked='checked1'
+										label='全选'
+						                name="全选"
+						            >
+						            </u-checkbox>
+						        </u-checkbox-group>
+					</view>
+				</view>
+				<view class='more'>
+					 <u-checkbox-group
+					            v-model="checkList1"
+					            placement="row"
+					            @change="checkboxChange1"
+					        >
+					            <u-checkbox
+					                :customStyle="{marginBottom: '8px'}"
+					                v-for="(item, index) in checkboxList1"
+					                :key="index"
+									:checked='item.checked'
+					                :label="item.name"
+					                :name="item.name"
+					            >
+					            </u-checkbox>
+					        </u-checkbox-group>
+				</view>
+			</view>
+			
+			<view>
+				<view class='flex justify-space-between'>
+					<view style='width:25%;'>家居</view>
+					<view style='width:25%;'></view>
+					<view style='width:25%;'></view>
+					<view class='checkall'>
+						<u-checkbox-group
+						            v-model="checkboxValue2"
+						            placement="column"
+						            @change="checkboxChange2"
+						        >
+						            <u-checkbox
+						                :customStyle="{marginBottom: '8px'}"
+						                :checked='checked2'
+										label='全选'
+						                name="全选"
+						            >
+						            </u-checkbox>
+						        </u-checkbox-group>
+					</view>
+				</view>
+				<view class='more'>
+					 <u-checkbox-group
+					            v-model="checkList2"
+					            placement="row"
+					            @change="checkboxChange2"
+					        >
+					            <u-checkbox
+					                :customStyle="{marginBottom: '8px'}"
+					                v-for="(item, index) in checkboxList2"
+					                :key="index"
+									:checked='item.checked'
+					                :label="item.name"
+					                :name="item.name"
+					            >
+					            </u-checkbox>
+					        </u-checkbox-group>
+				</view>
+			</view>
+			
+			<view>
+				<view class='flex justify-space-between'>
+					<view style='width:25%;'>卫浴</view>
+					<view style='width:25%;'></view>
+					<view style='width:25%;'></view>
+					<view class='checkall'>
+						<u-checkbox-group
+						            v-model="checkboxValue3"
+						            placement="column"
+						            @change="checkboxChange3"
+						        >
+						            <u-checkbox
+						                :customStyle="{marginBottom: '8px'}"
+						                :checked='checked3'
+										label='全选'
+						                name="全选"
+						            >
+						            </u-checkbox>
+						        </u-checkbox-group>
+					</view>
+				</view>
+				<view class='more'>
+					 <u-checkbox-group
+					            v-model="checkList3"
+					            placement="row"
+					            @change="checkboxChange3"
+					        >
+					            <u-checkbox
+					                :customStyle="{marginBottom: '8px'}"
+					                v-for="(item, index) in checkboxList3"
+					                :key="index"
+									:checked='item.checked'
+					                :label="item.name"
+					                :name="item.name"
+					            >
+					            </u-checkbox>
+					        </u-checkbox-group>
+				</view>
+			</view>
+			
+			<view>
+				<view class='flex justify-space-between'>
+					<view style='width:25%;'>餐厨</view>
+					<view style='width:25%;'></view>
+					<view style='width:25%;'></view>
+					<view class='checkall'>
+						<u-checkbox-group
+						            v-model="checkboxValue4"
+						            placement="column"
+						            @change="checkboxChange4"
+						        >
+						            <u-checkbox
+						                :customStyle="{marginBottom: '8px'}"
+						                :checked='checked4'
+										label='全选'
+						                name="全选"
+						            >
+						            </u-checkbox>
+						        </u-checkbox-group>
+					</view>
+				</view>
+				<view class='more'>
+					 <u-checkbox-group
+					            v-model="checkList4"
+					            placement="row"
+					            @change="checkboxChange4"
+					        >
+					            <u-checkbox
+					                :customStyle="{marginBottom: '8px'}"
+					                v-for="(item, index) in checkboxList4"
+					                :key="index"
+									:checked='item.checked'
+					                :label="item.name"
+					                :name="item.name"
+					            >
+					            </u-checkbox>
+					        </u-checkbox-group>
+				</view>
+			</view>
+			
+			<view>
+				<view class='flex justify-space-between'>
+					<view style='width:25%;'>建筑</view>
+					<view style='width:25%;'></view>
+					<view style='width:25%;'></view>
+					<view class='checkall'>
+						<u-checkbox-group
+						            v-model="checkboxValue5"
+						            placement="column"
+						            @change="checkboxChange5"
+						        >
+						            <u-checkbox
+						                :customStyle="{marginBottom: '8px'}"
+						                :checked='checked5'
+										label='全选'
+						                name="全选"
+						            >
+						            </u-checkbox>
+						        </u-checkbox-group>
+					</view>
+				</view>
+				<view class='more'>
+					 <u-checkbox-group
+					            v-model="checkList5"
+					            placement="row"
+					            @change="checkboxChange5"
+					        >
+					            <u-checkbox
+					                :customStyle="{marginBottom: '8px'}"
+					                v-for="(item, index) in checkboxList5"
+					                :key="index"
+									:checked='item.checked'
+					                :label="item.name"
+					                :name="item.name"
+					            >
+					            </u-checkbox>
+					        </u-checkbox-group>
+				</view>
+			</view>
+		</view>
+		<view class="mercharts_footer">
+			<button @click='submit' class="submit">提交</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	var that
 	export default {
 		data() {
 			return {
-				
+				form:{},
+				fileList1:[],
+				checked1:false,
+				checked2:false,
+				checked3:false,
+				checked4:false,
+				checked5:false,
+				room:'',
+				hall:'',
+				toilet:'',
+				labelList:[{value:''},{value:''},{value:''},{value:''}],
+				checkList1:[],
+				checkList2:[],
+				checkList3:[],
+				checkList4:[],
+				checkList5:[],
+				checkboxValue1:'',
+				checkboxValue2:'',
+				checkboxValue3:'',
+				checkboxValue4:'',
+				checkboxValue5:'',
+				checkboxList1:[{name:'行李寄存',checked:false},{name:'可长租',checked:false},{name:'自助入住',checked:false},{name:'免费停车',checked:false}],
+				checkboxList2:[{name:'电视',checked:false},{name:'洗衣机',checked:false},{name:'冰箱',checked:false},{name:'空调',checked:false}
+				,{name:'热水壶',checked:false},{name:'免费wifi',checked:false}],
+				checkboxList3:[{name:'吹风机',checked:false},{name:'洗发水',checked:false},{name:'沐浴露',checked:false},{name:'独立卫浴',checked:false}
+				,{name:'拖鞋',checked:false},{name:'牙具',checked:false},{name:'毛巾',checked:false},{name:'浴巾',checked:false},{name:'纸巾',checked:false},
+				{name:'热水淋浴',checked:false},{name:'香皂',checked:false}],
+				checkboxList4:[{name:'餐具',checked:false},{name:'锅具',checked:false},{name:'调料',checked:false},{name:'电磁炉',checked:false}
+				,{name:'天然气',checked:false},{name:'刀具',checked:false},{name:'菜板',checked:false},{name:'汤勺',checked:false}],
+				checkboxList5:[{name:'电梯',checked:false},{name:'窗户',checked:false},{name:'落地窗',checked:false},{name:'海景',checked:false}],
 			}
 		},
-		methods: {
+		onLoad() {
+			that = this
+		},
+		onShow() {
 			
+		},
+		methods: {
+			checkboxChange1(e){
+				var data=JSON.parse(JSON.stringify(e))
+				this.$forceUpdate()
+				if(e[0]){
+					if(e[0]=='全选'){
+						this.checkboxList1=this.checkboxList1.map((item)=>{
+							item.checked = true 
+							return item})
+					}else{	
+						this.checkboxList1=this.checkboxList1.map((item)=>{
+								item.checked = false 
+								return item})
+						for(var i=0;i<data.length;i++){
+							var index=this.checkboxList1.findIndex((item)=>{return item.name==data[i]})
+							if(index!=-1) this.checkboxList1[index].checked=true
+							else  this.checkboxList1[index].checked=false
+						}
+						if(this.checkboxList1.every((item)=>{return item.checked==true})==true){
+							this.checked1=true
+						}else{
+							this.checked1=false
+						}
+					}
+				}else{
+					if(this.checkboxValue1){
+						this.checkboxList1=this.checkboxList1.map((item)=>{
+							item.checked = false 
+							return item})
+					}
+				}
+				console.log(this.checkboxList1,this.checkList1)
+			},
+			checkboxChange5(e){
+				var data=JSON.parse(JSON.stringify(e))
+				this.$forceUpdate()
+				if(e[0]){
+					if(e[0]=='全选'){
+						this.checkboxList5=this.checkboxList5.map((item)=>{
+							item.checked = true 
+							return item})
+					}else{	
+						this.checkboxList5=this.checkboxList5.map((item)=>{
+								item.checked = false 
+								return item})
+						for(var i=0;i<data.length;i++){
+							var index=this.checkboxList5.findIndex((item)=>{return item.name==data[i]})
+							if(index!=-1) this.checkboxList5[index].checked=true
+							else  this.checkboxList5[index].checked=false
+						}
+						if(this.checkboxList5.every((item)=>{return item.checked==true})==true){
+							this.checked5=true
+						}else{
+							this.checked5=false
+						}
+					}
+				}else{
+					if(this.checkboxValue1){
+						this.checkboxList1=this.checkboxList1.map((item)=>{
+							item.checked = false 
+							return item})
+					}
+				}
+				console.log(this.checkboxList5,this.checkList5)
+			},
+			placeSelect() {
+				uni.chooseLocation({
+					success: function(res) {
+						console.log(res);
+						that.form.location = res.latitude + ',' + res.longitude
+						let _address = that.$helper.formatLocation(res.address)
+						console.log(_address)
+						that.form.province = _address.Province
+						that.form.city = _address.City
+						that.form.area = _address.Country
+						that.form.detailedAddress = _address.Village
+						that.$forceUpdate()
+					}
+				});
+			},
+			hideKeyboard() {
+				uni.hideKeyboard()
+			},
 		}
 	}
 </script>
 
-<style>
-
+<style lang='scss' scoped>
+/deep/.u-checkbox-group{
+	flex-wrap: wrap;
+}
+.checkall{
+	width:25%;
+}
+/* .checkall /deep/.u-checkbox-group{
+	padding-right: 9vw;
+} */
+.more /deep/.u-checkbox-group .u-checkbox{
+		width:25%;
+		
+	}
 </style>

uni_applet/pageA/find/createLifeService.vue

@@ -9,10 +9,10 @@
 					</u-radio-group>
 				</u-form-item>
 				<u-form-item v-if='form.mainBody=="商铺"' labelWidth='80' labelPosition='left' label="店铺名称">	
-					<u-input inputAlign='right' border='none' placeholder='输入店铺名称' v-model="form.shopNames" />
+					<u-input maxlength="15" inputAlign='right' border='none' placeholder='输入店铺名称' v-model="form.shopNames" />
 				</u-form-item>
 				<u-form-item v-if='form.mainBody=="个人"' labelWidth='80' labelPosition='left' label="服务名称">
-					<u-input inputAlign='right' border='none' placeholder='输入服务名称，如跑腿、代驾' v-model="form.shopNames" />
+					<u-input maxlength="15" inputAlign='right' border='none' placeholder='输入服务名称，如跑腿、代驾' v-model="form.shopNames" />
 				</u-form-item>
 				<u-form-item labelWidth='80' labelPosition='top' label="封面图片">
 					<u-upload :fileList="fileList1" @afterRead="afterRead($event,0)" @delete="deletePic" name="1" multiple
@@ -28,7 +28,7 @@
 					</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 maxlength="15" inputAlign='right' border='none' placeholder='输入详细地址，不超过15个字' v-model="form.detailedAddress" />
 				</u-form-item>
 				<u-form-item  labelWidth='80' labelPosition='top' label="业务描述">
 					<u--textarea  v-model="form.serviceDescription" autoHeight placeholder="输入业务描述，0-200个字" ></u--textarea> 
@@ -44,7 +44,7 @@
 					<u-input inputAlign='right' placeholder='输入称呼,如李先生' border='none' v-model="form.sex" type="select" />
 				</u-form-item>
 				<u-form-item labelWidth='160' labelPosition='left' label="联系电话(所有人可见)">
-					<u-input inputAlign='right' maxlength="15" type='number' placeholder='输入联系电话' border='none' v-model="form.phone"  />
+					<u-input type='digit' inputAlign='right' maxlength="15" placeholder='输入联系电话' border='none' v-model="form.phone"  />
 				</u-form-item>
 				<u-form-item v-if='form.mainBody=="商铺"' labelWidth='80' labelPosition='top' label="营业执照">
 					<u-upload height='208' width='320' :fileList="fileList2" @afterRead="afterRead($event,1)" @delete="deletePic" name="2" multiple
@@ -72,7 +72,7 @@
 					</u-upload>
 				</u-form-item>
 				<u-form-item   v-if='form.mainBody=="个人"' labelWidth='120' labelPosition='left' label="身份证号码">
-					<u-input inputAlign='right' border='none' placeholder='请输入身份证号码' v-model="form.personNo" />
+					<u-input  inputAlign='right' border='none' placeholder='请输入身份证号码' v-model="form.personNo" />
 				</u-form-item>
 				<view></view>
 			</u--form>
@@ -134,6 +134,70 @@
 				}else{
 					this.content='确定提交服务信息'
 				}
+				if(this.form.mainBody=='商铺'&&this.form.shopNames.length<2||this.form.mainBody=='商铺'&&this.form.shopNames.length>15){
+					uni.showToast({
+						icon: "none",
+						title: '店铺名称2-15个字！',
+						duration: 2000
+					});
+					return
+				}
+				if(this.form.mainBody=='个人'&&this.form.shopNames.length<2||this.form.mainBody=='个人'&&this.form.shopNames.length>15){
+					uni.showToast({
+						icon: "none",
+						title: '服务名称2-15个字！',
+						duration: 2000
+					});
+					return
+				}
+				if(!this.form.coverImage){
+					uni.showToast({
+						icon: "none",
+						title: '封面图片不能为空！',
+						duration: 2000
+					});
+					return
+				}
+				if(this.form.mainBody=='商铺'&!this.form.province){
+					uni.showToast({
+						icon: "none",
+						title: '店铺位置不能为空！',
+						duration: 2000
+					});
+					return
+				}
+				if(this.form.mainBody=='个人'&!this.form.province){
+					uni.showToast({
+						icon: "none",
+						title: '定位不能为空！',
+						duration: 2000
+					});
+					return
+				}
+				if(this.form.detailedAddress.length<6||this.form.detailedAddress.length>15){
+					uni.showToast({
+						icon: "none",
+						title: '详细地址6-15个字！',
+						duration: 2000
+					});
+					return
+				}
+				if(this.form.realname&&this.form.realname.length>6&&this.form.mainBody=='商铺'){
+					uni.showToast({
+						icon: "none",
+						title: '联系人最多6个字！',
+						duration: 2000
+					});
+					return
+				}
+				if(this.form.realname&&this.form.realname.length>6&&this.form.mainBody=='个人'){
+					uni.showToast({
+						icon: "none",
+						title: '姓名最多6个字！',
+						duration: 2000
+					});
+					return
+				}
 				this.isSubmit = true
 			},
 			confirmSubmit() {
@@ -258,8 +322,9 @@
 	 padding:20rpx;
  }
  .title{
-	 font-size:32rpx;
+	 font-size:36rpx;
 	 font-weight:600;
+	 margin:20rpx 0;
  }
  /deep/.u-radio-group,/deep/.u-radio-group--row {
 	flex-direction: row-reverse !important;

uni_applet/pageA/find/search.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view style='background:#fff;height:100vh;'>
 		<d-search-log :placeholder="'搜索名片'" :color_border="color_border" :color_text="color_border"
 			:search_list_old_man_num='15' :search_list_hot="search_list_hot" :store_key="store_key" :input_text="input_text"
 			@onClickDelAllApi="onClickDelAll" @onSearchNameApi="onSearchName" @onSearchvoiceApi='onSearchvoice'></d-search-log>
@@ -159,6 +159,14 @@
 </script>
 
 <style lang="scss" scoped>
+	/deep/.dSLComVue .dSLComVueTop {
+		width:100%;
+		margin-left:20rpx;
+		height:80rpx;
+	}
+	/deep/.dSLComVue1 .dSLComVueLog{
+		width:95%;
+	}
 	.shqx {
 		position: absolute;
 		top: -100rpx;

uni_applet/pages/find/find.vue

@@ -7,9 +7,9 @@
 			</view>
 			<view class=" search-wrap">
 				<view class="search flex justify-space-between align-item-center flex-between" @click="search">
-					<view class="left flex">
+					<view class="left flex  align-item-center">
 						<image class="dSLComVueTopLeftImg" style="width: 30rpx;height: 30rpx;flex: none;" src="@/static/image/card/search.png"></image>
-						<text class="search-val"> {{searchVal?searchVal:'搜索店铺或服务 '}}</text>
+						<view class="search-val"> {{searchVal?searchVal:'搜索店铺或服务 '}}</view>
 					</view>
 			
 					<view class="right">
@@ -22,8 +22,8 @@
 		
 		<view>
 			<mescroll-uni :up="upOption" :down="downOption" ref="mescrollRef" @init="mescrollInit"
-				@up="upCallback" @down="downCallback" height="1200">
-				<view style='margin-top:106rpx;'>
+				@up="upCallback" @down="downCallback" height="1400">
+				<view style='margin-top:108rpx;'>
 					<u-swiper :list="fileList"
 					autoplay
 					:height='height'
@@ -55,14 +55,14 @@
 								<view  class='name'>{{item.shopNames}}</view>
 							</view>
 							<view class='description'>
-								<mote-lines-divide :dt="item.serviceDescription" :line="4" expandText="展开" foldHint="收起" />
-								</view>
+								<mote-lines-divide :dt="item.serviceDescription" :line="3" expandText="展开" foldHint="收起" />
+							</view>
 						</view>
 					</view>
 					<view class='address flex justify-space-between'>
 						<view class='flex'>
 							<view class='iconfont applet-dizhi'></view>
-							<view>{{item.province}}{{item.city}}{{item.area}}</view>
+							<view>{{item.detailedAddress}}</view>
 						</view>
 						<view>{{item.distance1>1000?item.distance:item.distance1}}
 						<text style='font-weight:600;'>{{item.distance1>1000?'km':'m'}}</text></view>
@@ -127,6 +127,9 @@
 		// this.mescroll.resetUpScroll();
 		},
 		onShow(){
+			if(uni.getStorageSync("search_val")){
+				this.searchVal = uni.getStorageSync("search_val")
+			}
 			this.height = uni.getSystemInfoSync().windowWidth/2.35;
 			
 			this.width = uni.getSystemInfoSync().windowWidth;
@@ -339,7 +342,7 @@
 		padding: 20rpx;
 		background-color: #fff;
 		z-index:99;
-		width:95vw;
+		width:100vw;
 		.search {
 			// color: #9199af;
 			// background: #f9d27d;
@@ -351,9 +354,9 @@
 
 		.left {
 			width: 80%;
-
-			text {
-				height: 46rpx;
+			view {
+				height: 40rpx;
+				line-height: 40rpx;
 				white-space: nowrap;
 				overflow: scroll;
 				position: relative;

uni_applet/uni_modules/d-search-log/components/d-search-log/d-search-log.vue

@@ -16,12 +16,14 @@
 			</view>
 		</view>
 		
-		<view v-if="is_show_more" class="dSLComVue">
+		<view v-if="is_show_more" class="dSLComVue1">
 			<view class="dSLComVueTitle" >
 				<text>历史搜索</text>
-				<view style="width: 100rpx;height: 60rpx;display: flex;align-items: center;" @click="onClickDelAll">
-					<!-- <u-icon name="trash-fill" size="30"></u-icon> -->
-					<image src="@/static/image/card/del.png" style="width: 27rpx;height: 32rpx;margin-right: 35rpx;"></image>
+				<view style="width: 70rpx;height: 60rpx;display: flex;align-items: center;justify-content: space-between;" @click="onClickDelAll">
+					<view class="">
+						
+					</view>
+					<image src="@/static/image/card/del.png" style="width: 27rpx;height: 32rpx;margin-right: 16rpx;"></image>
 				</view>
 			</view>
 			
@@ -330,6 +332,26 @@
 			justify-content: space-between;
 			padding-left: 5%;
 		}
+
+	}
+	.dSLComVue1 {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		
+		.dSLComVueTitle {
+			width: 100%;
+			height: 80rpx;
+			display: flex;
+			font-weight: 600;
+			font-size: 26rpx;
+			align-items: center;
+			// background-color: #30c66c;
+			align-items: center;
+			justify-content: space-between;
+			padding-left: 5%;
+		}
 		.dSLComVueTitle text{
 			position:relative;
 			font-size:32rpx;

uni_applet/uni_modules/uview-ui/components/u-upload/u-upload.vue

@@ -368,7 +368,7 @@
 	$u-upload-deletable-right:0 !default;
 	$u-upload-deletable-top:0 !default;
 	$u-upload-deletable-bgColor:rgb(55, 55, 55) !default;
-	$u-upload-deletable-height:14px !default;
+	$u-upload-deletable-height:20px !default;
 	$u-upload-deletable-width:$u-upload-deletable-height;
 	$u-upload-deletable-boder-bottom-left-radius:100px !default;
 	$u-upload-deletable-zIndex:3 !default;
@@ -381,7 +381,7 @@
 	$u-upload-success-border-right-color:$u-upload-success-border-bottom-color;
 	$u-upload-success-border-width:9px !default;
 	$u-upload-icon-top:0px !default;
-	$u-upload-icon-right:0px !default;
+	$u-upload-icon-right:-2px !default;
 	$u-upload-icon-h5-top:1px !default;
 	$u-upload-icon-h5-right:0 !default;
 	$u-upload-icon-width:16px !default;

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/tourism/impl/ProductManagementServiceImpl.java

@@ -186,6 +186,8 @@ public class ProductManagementServiceImpl implements IProductManagementService{
 					}
 				}
 			}
+			//按权重降序 距离升序排序
+			list.sort(Comparator.comparing(ProductManagement::getWeightSort).reversed().thenComparing(ProductManagement::getDistance));
 		}
 		Integer count = productManagementMapper.selectCount(wrapper);
 		return new Page<ProductManagement>(list, page, limit, count);

unimall-admin/src/views/carouselManagement/index.vue

@@ -248,10 +248,7 @@ export default {
         if (!isIMAGE) {
           this.$message.error('上传文件只能是图片格式!')
         }
-        if (!isLt1M) {
-          this.$message.error('上传文件大小不能超过 1MB!')
-        }
-        return isIMAGE && isLt1M
+        return isIMAGE 
       },
     /** 查询轮播管理信息列表 */
     getList() {

unimall-data/src/main/java/com/iotechn/unimall/data/domain/ProductManagement.java

@@ -117,6 +117,11 @@ public class ProductManagement extends SuperDO{
     @TableField("status")
     private String status;
 
+    /** 权重排序 */
+    @Excel(name = "权重排序")
+    @TableField("weight_sort")
+    private Long weightSort;
+
     /**  */
     @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
     @TableField("gmt_create")