最后交接提交

msdYongHu/.hbuilderx/launch.json

@@ -23,10 +23,12 @@
             "type" : "uniCloud"
         },
         {
+            "customPlaygroundType" : "local",
             "playground" : "custom",
             "type" : "uni-app:app-android"
         },
         {
+            "customPlaygroundType" : "device",
             "playground" : "custom",
             "type" : "uni-app:app-ios"
         }

msdYongHu/App.vue

@@ -736,6 +736,14 @@ import baseUrlconst from "@/config/urlConfig.js"
  	align-items: center;
  	justify-content: center;
  }
+ 
+ .contentColumnS{
+ 	display: flex;
+ 	flex-direction: column;
+	align-items: center;
+	justify-content: space-between;
+ }
+ 
  .text1row{
  	overflow: hidden;
  	text-overflow: ellipsis;

msdYongHu/components/dachedengdai/dachedengdai.vue

@@ -1,67 +0,0 @@
-<template>
-	<view>
-		<view class="contentColumnC">
-			<view class="contentColumnC timectV">
-				<text class="textfontB4" style="color: white;">{{timeChange(timeInde)}}</text>
-				<text class="textfontB4" style="color: white;">呼叫中</text>
-			</view>
-			
-		</view>
-		<view class="contentColumnC">
-			<text class="quxiaohj" @click="actSelect(1)">取消呼叫</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"dachedengdai",
-		props: {
-			timeInde:0
-		},
-		data() {
-			return {
-				
-			};
-		},
-		methods:{
-			timeChange(timeInde){
-				var shi='00';
-				var fen='00';
-				var miao='00';
-				
-				shi = parseInt(timeInde/3600);
-				fen=timeInde%3600;
-				fen=parseInt(fen/60);
-				miao=timeInde%60;
-				return shi+':'+fen+':'+miao;
-			},
-			actSelect(index){
-				this.$emit('EddSelect',index);
-				
-			},
-		},
-	}
-</script>
-
-<style>
-
-.timectV{
-	width: 280rpx;
-	height: 280rpx;
-	border-radius: 140rpx;
-	background-color: rgba(80, 80, 80, 0.7);
-}
-.quxiaohj{
-	margin-top: 50rpx;
-	padding-left: 50rpx;
-	padding-right: 50rpx;
-	line-height: 60rpx;
-	text-align: center;
-	background-color: #1A1A1A;
-	color: white;
-	font-size: 34rpx;
-	border-radius: 30rpx;
-}
-
-</style>

msdYongHu/components/dachejiesuan/dachejiesuan.vue

@@ -1,207 +0,0 @@
-<template>
-	<view class="contentColumnC">
-		<view class="contentColumnC" style="width:700rpx;background-color: white;">
-			<view class="contentInRowL sizeSpace">
-				<text class="ztextfontB2">费用明细</text>
-			</view>
-			<view class="contentInRowS sizeSpace">
-				<view class="contentInRowL" style="align-items:center;">
-					<text class="textfontB3">总费用：</text>
-					<text style="font-size: 50rpx;font-weight: bold;">{{XChengObj.amount}}</text>
-					<text class="textfontB3">元</text>
-				</view>
-				<!-- <view class="contentInRowR">
-					<text class="textfontB3">支付宝支付</text>
-					<uni-icons></uni-icons>
-				</view> -->
-			</view>
-			<!-- <view class="contentInRowL sizeSpace">
-				<text class="textfontB3" style="color:darkgray;width: 660rpx;">预估价不含附加费，本次行程产生高速费12元，与预估相比正常，且无其他附加费用</text>
-			</view> -->
-			<view class="contentInRowS sizeSpace">
-				<text class="textfontB3">起步费</text>
-				<text class="textfontB3">{{qibuf}}元</text>
-			</view>
-			<view class="contentInRowS sizeSpace">
-				<text class="textfontB3">里程费</text>
-				<text class="textfontB3">{{XChengObj.fare}}元</text>
-			</view>
-			<view class="contentInRowS sizeSpace">
-				<text class="textfontB3">其他费用</text>
-				<text class="textfontB3">{{getqitafy()}}元</text>
-			</view>
-			<!-- <view class="contentInRowS sizeSpace">
-				<text class="textfontB3">优惠券</text>
-				<text class="textfontB3">0元</text>
-			</view> -->
-			<view class="contentColumnC bottomViewBt">
-				<text class="quxiaoBt" @click="quzhifu">去支付</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import api from "@/pages/api/api.js"
-	export default {
-		name:"dachejiesuan",
-		props: {
-			XChengObj:'',
-			qibuf:0
-		},
-		data() {
-			return {
-				
-			};
-		},
-		methods:{
-			getqitafy(){
-				var qt =  this.XChengObj.amount*1-this.XChengObj.fare*1-this.qibuf*1;
-				if(qt<=0){
-					qt=0;
-				}
-				return qt.toFixed(2);
-			},
-			quzhifu(){
-				uni.showToast({
-					title:'模拟支付完成',//that.i18n('api.wangluoshibai'),
-					icon: 'none',
-					duration: 2500
-				})
-				var data = {
-					id:this.XChengObj.id,
-					state:4
-				}
-				this.SetTxorder(data,0);
-			},
-			
-			SetTxorder(data,index){
-				api('SetTxorder',data,res=>{
-					console.log('SetTxorder------',res)
-					if(res.data.code==200){
-						this.pushMsg(this.XChengObj.driver.cid,this.XChengObj.user.phone,'乘客支付了');
-						uni.showToast({
-							title:'修改成功',//that.i18n('api.wangluoshibai'),
-							icon: 'none',
-							duration: 2500
-						})
-						this.$emit('EZfSelect',1);
-					}
-					else{
-						uni.showToast({
-							title:'修改失败',//that.i18n('api.wangluoshibai'),
-							icon: 'none',
-							duration: 2500
-						})
-					}
-				},failc=>{
-					//console.log('getTaxiPrices----',failc)
-					uni.showToast({
-						title:'网络错误',//that.i18n('api.wangluoshibai'),
-						icon: 'none',
-						duration: 2500
-					})
-				})
-			},
-			pushMsg(cid,phone,msg){//消息推送
-				var time=new Date();
-				var n,y,r,h,m,s;
-				n=time.getFullYear();
-				y=time.getMonth()+1;
-				r=time.getDate();
-				h=time.getHours();
-				m=time.getMinutes();
-				s=time.getSeconds();
-				
-				var timsStr = n+'-'+y+'-'+r+' '+h+':'+m+':'+s;
-				var payloadData={
-					rcuser:'尾号：'+phone.slice(-4),
-					time:timsStr,
-					msg:msg,
-					type:1
-				}
-				api('pushMsgQS',{
-					cid:cid,
-					title:'您有新消息了',
-					content:msg,
-					payload:payloadData
-				},res=>{
-					
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			getVNPay(){
-				var language = uni.getStorageSync('language');
-				var lg;
-				if(language=='yuenan'){
-					lg='vi';
-				}
-				else{
-					lg='en';
-				}
-				
-				api('VNPay',{
-					orderid:this.XChengObj.ddId,
-					amount:this.XChengObj.amount,
-					language:lg
-				},res=>{
-					if(res.data.code!=200){
-						uni.showToast({
-						    title: res.data.msg,
-						    icon: 'none',
-						    duration: 3500
-						})
-						return;
-					}
-					uni.navigateTo({
-						url:'/pages/OrderList/buy/Zhifuyemian?url='+ encodeURIComponent(JSON.stringify(res.data.data))+'&ddid='+this.XChengObj.ddId
-					})
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-		},
-	}
-</script>
-
-<style>
-.sizeSpace{
-	width:660rpx;
-	margin-top: 20rpx;
-	align-items: center;
-}
-.bottomViewBt{
-	margin-top: 40rpx;
-	width:580rpx;
-}
-
-.quxiaoBt{
-	margin-top: 30rpx;
-	margin-bottom: 30rpx;
-	padding-left: 50rpx;
-	padding-right: 50rpx;
-	font-size: 32rpx;
-	font-weight: bold;
-	line-height: 60rpx;
-	border-radius: 30rpx;
-	text-align: center;
-	background-color: #E86E48;
-	color: white;
-}
-
-.querenBt{
-	margin-top: 30rpx;
-	margin-bottom: 30rpx;
-	padding-left: 50rpx;
-	padding-right: 50rpx;
-	font-size: 32rpx;
-	font-weight: bold;
-	border: 1rpx solid darkgray;
-	line-height: 60rpx;
-	border-radius: 30rpx;
-	text-align: center;
-	background-color: white;
-	color: #1A1A1A;
-}
-</style>

msdYongHu/components/dachesijijied/dachesijijied.vue

@@ -1,123 +0,0 @@
-<template>
-	<view>
-		<view style="width:700rpx;background-color: white;">
-			<view class="contentInRowS sizeSpace">
-				<view class="contentInRowL">
-					<image class="iconViewI" src="/static/images/dache/sijitx.png" mode="scaleToFill"></image>
-					<view v-if="XChengObj.state==1" class="contentColumn" style="margin-left: 16rpx;">
-						<text class="ztextfontB4">司机正在赶来</text>
-						<text class="textfontS2" style="color: darkgray;">请耐心等待！</text>
-					</view>
-					<view v-if="XChengObj.state==2" class="contentColumn" style="margin-left: 16rpx;">
-						<text class="ztextfontB4">为保证行车安全，请不要跟司机聊天！</text>
-						<text class="textfontS2" style="color: darkgray;">请保管好个人物品，下车请拿好！</text>
-					</view>
-				</view>
-				<text class="textfontS2"> </text>
-				<!-- <text class="textfontS2" style="color: darkgray;"  @click="actSelect(0)">取消订单</text> -->
-			</view>
-			<view class="contentColumnC">
-				<view class="contentColumnC boxViewct">
-					<view class="contentInRowS boxsizeSpace">
-						<view class="contentColumn">
-							<view class="chepaiV">
-							</view>
-							<view style="margin-top: -30rpx;">
-								<text class="chepaiText">京A23456</text>
-							</view>
-							<text class="ztextfontB4" style="margin-top: 40rpx;">黑色·丰田 凯美瑞</text>
-							<view class="contentInRowL" style="align-items: center;">
-								<text class="textfontB5" style="color: darkgray;">{{XChengObj.driver.nickName}}</text>
-								<text class="textfontB5"  style="color: darkgray;padding-left: 16rpx;">接单累计:1095</text>
-								<image style="width: 26rpx;height: 26rpx;" src="/static/images/dache/huangsexx.png" mode="scaleToFill"></image>
-							</view>
-						</view>
-						<view class="contentInRowR">
-							<image style="width: 70rpx;height: 70rpx;margin-right: 20rpx;" src="/static/images/dache/dianhualianxi.png" mode="scaleToFill"  @click="actSelect(1)"></image>
-							<image style="width: 70rpx;height: 70rpx;" src="/static/images/dache/xinxlt.png" mode="scaleToFill"  @click="actSelect(2)"></image>
-						</view>
-					</view>
-					<view style="height: 2rpx;background-color: lightgray;margin-top: 20rpx;margin-bottom: 20rpx;"></view>
-					<view class="contentInRowS boxsizeSpace">
-						<view class="contentColumnC"  @click="actSelect(3)">
-							<image class="actIconV" src="/static/images/dache/baojing.png" mode="scaleToFill"></image>
-							<text class="textfontB5" style="color: darkgray;">一键报警</text>
-						</view>
-						<view class="contentColumnC" @click="actSelect(4)">
-							<image class="actIconV" src="/static/images/dache/kefu.png" mode="scaleToFill"></image>
-							<text class="textfontB5" style="color: darkgray;">客服中心</text>
-						</view>
-						<view class="contentColumnC"  @click="actSelect(5)">
-							<image class="actIconV" src="/static/images/dache/xiugai.png" mode="scaleToFill"></image>
-							<text class="textfontB5" style="color: darkgray;">修改目的地</text>
-						</view>
-						<view class="contentColumnC"  @click="actSelect(6)">
-							<image class="actIconV" src="/static/images/dache/liuyan.png" mode="scaleToFill"></image>
-							<text class="textfontB5" style="color: darkgray;">语音留言</text>
-						</view>
-					</view>
-				</view>
-				<view style="height: 40rpx;"></view>
-			</view>
-			
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"dachesijijied",
-		props: {
-			XChengObj:''
-		},
-		data() {
-			return {
-
-			};
-		},
-		methods:{
-			actSelect(index){
-				this.$emit('EJDactSelect',index);
-			},
-		},
-	}
-</script>
-
-<style>
-.iconViewI{
-	width: 100rpx;
-	height: 100rpx;
-}
-.sizeSpace{
-	width: 660rpx;
-}
-
-.boxViewct{
-	margin-top: 20rpx;
-	width: 660rpx;
-	border-radius: 20rpx;
-	border: 1rpx solid lightgray;
-	/* box-shadow: 0rpx 0rpx 20rpx 0rpx lightgray; */
-}
-
-.boxsizeSpace{
-	width: 620rpx;
-}
-
-.chepaiV{
-	margin-top: 40rpx;
-	height: 30rpx;
-	background: linear-gradient(to right, #E86E48, #FFFFFF);
-}
-.chepaiText{
-	font-size: 50rpx;
-	line-height: 60rpx;
-	font-weight: bold;
-}
-
-.actIconV{
-	width: 60rpx;
-	height: 60rpx;
-}
-
-</style>

msdYongHu/components/dachexingcheng/dachexingcheng.vue

@@ -1,114 +0,0 @@
-<template>
-	<view >
-		<view class="contentColumnC" style="width: 700rpx;background-color: white;">
-			<view style="height: 20rpx;"></view>
-			<view v-if="weizhifu!=0" class="contentInRowS noteCtView" @click="actIndex(0)">
-				<text style="color: white;font-size: 32rpx;margin-left: 10rpx;">您有订单未完成支付！</text>
-				<uni-icons custom-prefix="custom-icon" color="white" type="right" size="24"></uni-icons>
-			</view>
-			<view class="contentInRowS" style="width:660rpx;align-items: center;">
-				<view class="contentInRowL" style="align-items: center;">
-					<text style="width: 20rpx;height: 20rpx;border-radius: 10rpx;background-color:#65AB91;"></text>
-					<view class="contentColumn" style="width: 580rpx;">
-						<text class="staddrtext">{{XChengObj.boardingAddress}}</text>
-						<text style="color: #65AB91;font-size: 24rpx;margin-left: 10rpx;">当前位置</text>
-					</view>
-				</view>
-				<uni-icons v-if="xiugai==0" custom-prefix="custom-icon" color="slateblue" type="refresh" size="32"  @click="actIndex(1)"></uni-icons>
-			</view>
-			<view class="contentInRowL mudidiViewct">
-				<view class="contentInRowL" style="align-items: center;">
-					<text style="width: 20rpx;height: 20rpx;border-radius: 10rpx;background-color:#E86E48;"></text>
-					<view class="contentColumn" style="width: 580rpx;">
-						<text class="staddrtext" style="color: #E86E48;">{{XChengObj.downAddress}}</text>
-						<text style="color: #E86E48;font-size: 24rpx;margin-left: 10rpx;">目的地</text>
-					</view>
-				</view>
-			</view>
-			<view v-if="XChengObj.distance!=''" class="contentInRowS" style="width:660rpx;align-items: center;">
-				<text class="staddrtext">里程：{{XChengObj.distance}}Km</text>
-				<text class="staddrtext" style="color: #E86E48;">预计用时：{{XChengObj.estimatedDuration}}</text>
-				<text class="staddrtext" style="color:darkmagenta;">车费：{{XChengObj.amount}}元</text>
-			</view>
-			<view style="height: 20rpx;"></view>
-		</view>
-		<view class="contentColumnC" style="margin-top: 40rpx;">
-			<text v-if="xiugai==0" class="actBTzhifu" @click="actIndex(2)">{{i18n('dache.woyaojiaoche')}}</text>
-			<text v-if="xiugai==1" class="actBTzhifu" @click="actIndex(3)">{{i18n('dache.xiugaimudd')}}</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"dachexingcheng",
-		props:{
-			XChengObj:'',
-			xiugai:0,
-			weizhifu:0
-		},
-		data() {
-			return {
-				mudidi:'',
-				mdaddr:'',
-			};
-		},
-		methods:{
-			i18n(str){
-				return getApp().globalData.$t(str);
-			},
-			actIndex(index){
-				this.$emit('EXCactSelect',index,'');
-			},
-			mdaddrinput(event){
-				this.mdaddr = event.target.value;
-				this.$emit('EXCactSelect',4,this.mdaddr);
-			},
-		},
-	}
-</script>
-
-<style>
-.noteCtView{
-	width: 660rpx;
-	align-items: center;
-	background-color: #E86E48;
-	border-radius: 10rpx;
-	margin-bottom: 20rpx;
-	height: 60rpx;
-}
-.staddrtext{
-	margin-left: 10rpx;
-	font-size: 28rpx;
-	color: #65AB91;
-}
-
-.mudidiViewct{
-	width: 660rpx;
-	align-items: center;
-	margin-top: 20rpx;
-	margin-bottom: 20rpx;
-	
-}
-.noinputV{
-	margin-left: 10rpx;
-	margin-top: 10rpx;
-	margin-bottom: 10rpx;
-	width: 580rpx;
-	height: 60rpx;
-	background-color: #F2F4FF;
-	border-radius: 8rpx;
-}
-.actBTzhifu{
-	font-size: 30rpx;
-	font-weight: bold;
-	line-height: 60rpx;
-	padding-left: 50rpx;
-	padding-right: 50rpx;
-	border-radius: 30rpx;
-	color: white;
-	background-color: #E86E48;
-	margin-bottom: 16rpx;
-
-}
-</style>

msdYongHu/components/dachexuancx/dachexuancx.vue

@@ -1,192 +0,0 @@
-<template>
-	<view class="contentColumnC">
-		<view class="contentColumnC popViewctv">
-			<view class="contentInRowS sizeSpace">
-				<view class="contentColumnC" @click="luxianSelect(0)">
-					<text class="xianluti" :style="xianluIndex==0?'background-color:#E86E48;':''">推荐线路</text>
-					<text class="timeText">{{XChengObj.estimatedDuration}}</text>
-					<text class="luchengText">{{XChengObj.distance}}Km</text>
-				</view>
-				<!-- <view class="contentColumnC" @click="luxianSelect(1)">
-					<text class="xianluti" :style="xianluIndex==1?'background-color:#E86E48;':''">线路2</text>
-					<text class="timeText">16分钟</text>
-					<text class="luchengText">6.5Km</text>
-				</view>
-				<view class="contentColumnC" @click="luxianSelect(2)">
-					<text class="xianluti" :style="xianluIndex==2?'background-color:#E86E48;':''">线路3</text>
-					<text class="timeText">16分钟</text>
-					<text class="luchengText">6.5Km</text>
-				</view> -->
-			</view>
-			<view class="sizeSpace" style="margin-top: 26rpx;">
-				<text class="textfontB5" >选择车型</text>
-			</view>
-			<view class="contentColumn">
-				<view class="lineBackColor" @click="chexingSle(0)">
-					<view class="contentInRowS sizeSpace" style="align-items: center;padding-top: 8rpx;padding-bottom: 16rpx;">
-						<view class="contentInRowL" style="align-items: center;">
-							<image style="width: 100rpx;height: 50rpx;" src="/static/images/dache/dachetb.png" mode="scaleToFill"></image>
-							<text class="ztextfontB3" style="margin-left: 10rpx;">特惠快车</text>
-						</view>
-						<view class="contentInRowR" style="align-items: center;width: 300rpx;">
-							<view class="contentInRowR" style="align-items:center;margin-right: 20rpx;">
-								<text class="textfontS3">预估</text>
-								<text class="ztextfontB1">{{XChengObj.amount}}</text>
-								<text class="textfontS3">元</text>
-							</view>
-							<uni-icons v-if="selchexList[0]==1" custom-prefix="custom-icon" color="#FFFFFF" type="checkbox" size="30"></uni-icons>
-						</view>
-					</view>
-				</view>
-				<view class="lineBackColor" @click="chexingSle(1)">
-					<view class="contentInRowS sizeSpace" style="align-items: center;padding-top: 16rpx;padding-bottom: 16rpx;">
-						<view class="contentInRowL" style="align-items: center;">
-							<image style="width: 100rpx;height: 50rpx;" src="/static/images/dache/dachetb.png" mode="scaleToFill"></image>
-							<text class="ztextfontB3" style="margin-left: 10rpx;">特惠快车</text>
-						</view>
-						<view class="contentInRowR" style="align-items: center;width: 300rpx;">
-							<view class="contentInRowR" style="align-items:center;margin-right: 20rpx;">
-								<text class="textfontS3">预估</text>
-								<text class="ztextfontB1">{{XChengObj.amount}}</text>
-								<text class="textfontS3">元</text>
-							</view>
-							<uni-icons v-if="selchexList[1]==1" custom-prefix="custom-icon" color="#FFFFFF" type="checkbox" size="30"></uni-icons>
-						</view>
-					</view>
-				</view>
-				<view class="lineBackColor" @click="chexingSle(2)">
-					<view class="contentInRowS sizeSpace" style="align-items: center;padding-top: 16rpx;padding-bottom: 16rpx;">
-						<view class="contentInRowL" style="align-items: center;">
-							<image style="width: 100rpx;height: 50rpx;" src="/static/images/dache/dachetb.png" mode="scaleToFill"></image>
-							<text class="ztextfontB3" style="margin-left: 10rpx;">特惠快车</text>
-						</view>
-						<view class="contentInRowR" style="align-items: center;width: 300rpx;">
-							<view class="contentInRowR" style="align-items:center;margin-right: 20rpx;">
-								<text class="textfontS3">预估</text>
-								<text class="ztextfontB1">{{XChengObj.amount}}</text>
-								<text class="textfontS3">元</text>
-							</view>
-							<uni-icons v-if="selchexList[2]==1" custom-prefix="custom-icon" color="#FFFFFF" type="checkbox" size="30"></uni-icons>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="contentInRowS sizeSpace bottomView">
-				<view v-if="selSum==0" class="contentInRowL" style="align-items: center;color: white;width: 400rpx;">
-					<text class="textfontS3" style="padding-left: 20rpx;color: white;">至少选择一种车型</text>
-				</view>
-				<view v-if="selSum>0" class="contentInRowL" style="align-items: center;color: white;width: 400rpx;">
-					<text class="textfontS3" style="padding-left: 20rpx;color: white;">已选{{selSum}}种车型 | 预估</text>
-					<text class="textfontS3" style="color: white;">{{XChengObj.amount}}</text>
-					<text class="textfontS3" style="color: white;">元</text>
-				</view>
-				<text class="hujiaoBt ztextfontB4" @click="querenhj">确认呼叫</text>
-			</view>
-		</view>
-	</view>
-	
-</template>
-
-<script>
-	export default {
-		name:"dachexuancx",
-		props: {
-			XChengObj:''
-		},
-		data() {
-			return {
-				xianluIndex:0,
-				chexIndex:0,
-				selchexList:[1,0,0],
-				selSum:1,
-				obj:'',
-			};
-		},
-		methods:{
-			setxcObj(obj){
-				console.log('setxcObj------',obj)
-			},
-			luxianSelect(index){
-				this.xianluIndex=index;
-			},
-			chexingSle(index){
-				if(this.selchexList[index]==1){
-					this.selchexList[index]=0;
-				}
-				else{
-					this.selchexList[index]=1;
-				}
-				this.obj=this.XChengObj;
-				this.obj.taxiType='0';
-				this.getShuliang();
-			},
-			getShuliang(){
-				var index = 0;
-				for(var i=0;i<this.selchexList.length;i++){
-					if(this.selchexList[i]!=0){
-						index=index+1;
-					}
-				}
-				this.selSum=index;
-			},
-			querenhj(){
-				if(this.obj==''){
-					this.obj=this.XChengObj;
-				}
-				this.$emit('EQuerenhj',this.obj);
-			},
-		}
-	}
-</script>
-
-<style>
-.popViewctv{
-	width: 700rpx;
-	border-radius: 20rpx 20rpx 0rpx 0rpx;
-	background-color:white
-}
-.sizeSpace{
-	width: 660rpx;
-}
-.xianluti{
-	font-size: 34rpx;
-	padding-left: 20rpx;
-	padding-right: 20rpx;
-	line-height: 50rpx;
-	background-color: darkgray;
-	color: black;
-	border-radius: 0 0 20rpx 20rpx;
-}
-
-.timeText{
-	font-size: 36rpx;
-	color: black;
-}
-
-.luchengText{
-	font-size: 28rpx;
-	color: darkgray;
-}
-.lineBackColor{
-	margin-top: 20rpx;
-	align-items: center;
-	background: linear-gradient(to right, #FFFFFF, #E86E48);
-}
-
-.bottomView{
-	margin-top: 30rpx;
-	background-color: #1a1a1a;
-	height: 80rpx;
-	border-radius: 40rpx;
-}
-
-.hujiaoBt{
-	background-color: #E86E48;
-	line-height: 80rpx;
-	border-radius: 40rpx;
-	padding-left: 60rpx;
-	padding-right: 60rpx;
-	text-align: center;
-	color: white;
-}
-</style>

msdYongHu/components/fenleiList/fenleiList - 副本.vue

@@ -1,241 +0,0 @@
-<template>
-	<view v-if="objList.length==6" class="item_list6">
-		<view class="item_content">
-			<view class="contentV" style="height: 360rpx;" @click="fenleixuanz(objList[0].id)">
-				<view class="">
-					<view class="title ztextfontB3">
-						<text>{{objList[0].title}}</text>
-					</view>
-					<view class="detail towrow textfontB5" style="width: 260rpx;">
-						<text>{{objList[0].detail}}</text>
-					</view>
-				</view>
-				<view class="viewInRow">
-					<netImage class="imagIconB" backgrS="1" width="190" height="190" :mysrc="objList[0].imageUrl" mymode="scaleToFill"></netImage>
-				</view>
-			</view>
-			<view class="contentV" style="height: 220rpx;" @click="fenleixuanz(objList[1].id)">
-				<view class="title textfontB5">
-					<text>{{objList[1].title}}</text>
-				</view>
-				<view class="viewInRow">
-					<text class="detail textfontB4">{{objList[1].detail}}</text>
-					<netImage class="imagIconM" backgrS="1" width="136" height="136" :mysrc="objList[1].imageUrl" mymode="scaleToFill"></netImage>
-				</view>
-			</view>
-			<view class="contentV" style="height: 150rpx;" @click="fenleixuanz(objList[2].id)">
-				<view class="viewInRow">
-					<view>
-						<view class="title ztextfontB3">
-							<text>{{objList[2].title}}</text>
-						</view>
-						<view class="detail textfontB5">
-							<text >{{objList[2].detail}}</text>
-						</view>
-					</view>
-					<netImage class="imagIconS" backgrS="1" width="120" height="120" :mysrc="objList[2].imageUrl" mymode="scaleToFill"></netImage>
-				</view>
-			</view>
-		</view>
-		
-		<view class="item_content">
-			<view class="contentV" style="height: 220rpx;" @click="fenleixuanz(objList[3].id)">
-				<view class="title ztextfontB3">
-					<text>{{objList[3].title}}</text>
-				</view>
-				<view class="viewInRow">
-					<view class="detail textfontB5">
-						<text>{{objList[3].detail}}</text>
-					</view>
-					<netImage class="imagIconM" backgrS="1" width="126" height="126" :mysrc="objList[3].imageUrl" mymode="scaleToFill"></netImage>
-				</view>
-			</view>
-			<view class="contentV" style="height: 270rpx;" @click="fenleixuanz(objList[4].id)">
-				<view class="">
-					<view class="title ztextfontB3">
-						<text>{{objList[4].title}}</text>
-					</view>
-					<text class="detail onerow textfontB5">{{objList[4].detail}}</text>
-				</view>
-				<view class="viewInRow">
-					<netImage class="imagIconBL" backgrS="1" width="130" height="130" :mysrc="objList[4].imageUrl" mymode="scaleToFill"></netImage>
-				</view>
-			</view>
-			<view class="contentV" style="height: 240rpx;" @click="fenleixuanz(objList[5].id)">
-				<view class="title ztextfontB3">
-					<text>{{objList[5].title}}</text>
-				</view>
-				<view class="viewInRow">
-					<text class="detail textfontB5">{{objList[5].detail}}</text>
-					<netImage class="imagIconM" backgrS="1" width="140" height="140" :mysrc="objList[5].imageUrl" mymode="scaleToFill"></netImage>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import api from "@/pages/api/api.js"
-	export default {
-		data() {
-			return {
-				listsize:0,
-				objList:[],
-				fenleiList:[],
-				
-			};
-		},
-		
-		methods:{
-			getfenleiList(){
-				api('fwlxlist',{
-					pageNum:1,
-					pageSize:20
-				},res=>{
-					if(res.data.code!=200){
-						return;
-					}
-					this.initListObj(res.data.rows)
-					//console.log('1111333333',res);
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			
-			initListObj(list){
-				this.listsize=list.length;
-				this.objList=[];
-				var tmpList=[];
-				var language = uni.getStorageSync('language');
-				if(language=='yuenan'){
-					for(var i=0;i<this.listsize;i++){
-						var obj={
-							id:list[i].id,
-							imageUrl:list[i].image,
-							title:list[i].nameVi,
-							detail:list[i].illustrateVi
-						};
-						tmpList.push(obj);
-					}
-				}
-				else if(language=='zh-Hans'){
-					for(var i=0;i<this.listsize;i++){
-						var obj={
-							id:list[i].id,
-							imageUrl:list[i].image,
-							title:list[i].nameCn,
-							detail:list[i].illustrateCn
-						};
-						tmpList.push(obj);
-					}
-				}
-				else if(language=='zh-Hant'){
-					for(var i=0;i<this.listsize;i++){
-						var obj={
-							id:list[i].id,
-							imageUrl:list[i].image,
-							title:list[i].nameTw,
-							detail:list[i].illustrateTw
-						};
-						tmpList.push(obj);
-					}
-				}
-				this.objList=tmpList;
-				
-			},
-			fenleixuanz(e){
-				this.$emit('Efwflxuanze',e);
-			},
-		},
-	}
-</script>
-
-<style lang="scss">
-@font-face {
-	font-family: zrht;
-	src: url('/uni_modules/font/zrht.otf');
-}
-	.item_list6{
-		padding: 0 40rpx;
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
-		
-		background-color: #F2F3F7;
-	}
-	.item_content{
-		width: 48%;
-		margin: 20rpx 0;
-		box-sizing: border-box;
-	}
-	.contentV{
-		margin-top: 20rpx;
-		background: white;
-		align-items: center;
-		border-radius: 12rpx;
-		border: 1rpx solid lightgrey;
-		box-shadow: 0rpx 0rpx 10rpx 0rpx lightgrey;
-	}
-	
-	.viewInRow{
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-	}
-	
-	.title{
-		margin: 14rpx;
-		color:black;
-		font-weight:bold;
-	}
-	.detail{
-		margin-left: 14rpx;
-		color:black;
-	}
-	.imagIconB{
-		margin-left: auto;
-		margin-top: 0rpx;
-		margin-right: 6rpx;
-		margin-bottom: 0rpx;
-		width: 230rpx;
-		height: 230rpx;
-	}
-	.imagIconBL{
-		margin-left: auto;
-		margin-top: 0rpx;
-		margin-right: 6rpx;
-		margin-bottom: 0rpx;
-		width: 130rpx;
-		height: 130rpx;
-	}
-	.imagIconM{
-		margin-left: auto;
-		margin-top: 0rpx;
-		margin-right: 6rpx;
-		margin-bottom: 0rpx;
-		width: 136rpx;
-		height: 136rpx;
-	}
-	.imagIconS{
-		margin-left: auto;
-		margin-right: 6rpx;
-		margin-top: 10rpx;
-		width: 120rpx;
-		height: 120rpx;
-	}
-	.towrow{
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		-webkit-box-orient: vertical;
-	}
-	.onerow{
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 1;
-		-webkit-box-orient: vertical;
-	}
-		
-</style>

msdYongHu/components/foodxuangou/foodxuangou.vue → msdYongHu/components/pdPurchase/pdPurchase.vue

@@ -18,7 +18,7 @@
 			
 		</view>
 		<view style="display: flex;width:88%;margin-left:6%; margin-bottom: 20rpx;">
-			<label class="querenBt" @click="jiagouwuche()">{{$t('gouwu.jiarugouwc')}}</label>
+			<text class="querenBt" @click="jiagouwuche()">{{$t('gouwu.jiarugouwc')}}</text>
 		</view>
 		<uni-popup ref="bzPop":maskClick="false">
 			<view class="contentColumnC" style="width:700rpx;background-color: white;margin-left: 25rpx;border-radius: 10rpx;">
@@ -58,7 +58,7 @@
 
 <script>
 	export default {
-		name:"foodxuangou",
+		name:"pdPurchase",
 		props: {
 			food:'',
 			mendId:''
@@ -87,7 +87,7 @@
 				this.otherPrice = this.getotherPrice(this.skuGuige);
 				this.tempsku = this.gettempSKU(this.skuGuige);
 				this.beizhu='';
-				this.shuliang = 1;
+				this.shuliang = this.food.shuliang==0?1:this.food.shuliang;
 				this.$refs.bzPop.close();
 			}
 		},
@@ -120,6 +120,7 @@
 						"jvli": 0, //
 						"freight": 0, //
 						"amount": 0, //订单合计金额
+						"foodAmount": 0, //商品金额
 						"remarks": "", //备注
 						"type": 0, //订单类型：0外送，1自取，2堂食
 						"zuohao":'',
@@ -178,6 +179,7 @@
 						"jvli": 0, //
 						"freight": 0, //
 						"amount": 0, //订单合计金额
+						"foodAmount": 0, //商品金额
 						"remarks": "", //备注
 						"zuohao":'',
 						"type": 0, //订单类型：0外送，1自取，2堂食
@@ -209,7 +211,9 @@
 						var yidongjine=food.number*(parseFloat(food.price)+parseFloat(food.otherPrice));
 						goumaijine = goumaijine+yidongjine;
 					}
+					this.gouwuche[i].foodAmount=goumaijine;
 					this.gouwuche[i].amount=goumaijine;
+					
 				}
 				let tgwc = JSON.stringify(this.gouwuche);
 				uni.setStorageSync('gouwuche',tgwc);
@@ -293,13 +297,13 @@
 	line-height: 60rpx;
 	padding: 10rpx;
 	border-radius: 20rpx;
-	border: solid #00A6FF;
+	border: solid #40AE36;
 	border-width: 0px 0px 6rpx 0px;
 	text-align: center;
 	justify-content: center;
-	background-color: #00A6FF;
+	background-color: #40AE36;
 	color: white;
-	box-shadow: 0rpx 0rpx 10rpx 0rpx #00A6FF;
+	box-shadow: 0rpx 0rpx 10rpx 0rpx #40AE36;
 }
 .beizhuBt{
 	padding: 10rpx 16rpx 10rpx 16rpx;

msdYongHu/components/weizhimap/weizhimap - 副本.nvue

@@ -1,78 +0,0 @@
-<template>
-	<view>
-		<map id="map" class="mapbody" :style="'height:'+height+'rpx;'" scale="18" show-location="true" :latitude="latitude" :longitude="longitude" :markers="marker">
-		</map>
-	</view>
-</template>
-
-<script>
-	import api from "@/pages/api/api.js"
-	export default {
-		name:"weizhimap",
-		props:{
-			covers:'',
-			height:0
-		},
-		data() {
-			return {
-				latitude:0,
-				longitude:0,
-				marker:'',
-				markImage:'/static/images/dizhil@3x.png',
-			};
-		},
-		onReady() {
-			
-		},
-		watch:{
-			covers(val){
-				console.log('-----',val);
-				this.markImage = val[0].iconPath;
-				setTimeout(()=>{
-					this.setLocat(val[0].latitude,val[0].longitude,1,3);
-				},500)
-				
-			}
-		},
-		methods:{
-			
-			setLocat(latitude,longitude,f,t){
-				this.latitude=latitude;
-				this.longitude = longitude;
-				this.marker=[{
-					id:1,//控件id
-					latitude: this.latitude,
-					longitude: this.longitude,
-					iconPath: this.markImage
-				}];
-				console.log(this.marker);
-				return;
-				var latlng = longitude+','+latitude;
-				
-				api('setLocat',{
-					latlng:latlng,
-					from:f,
-					to:t
-				},res=>{
-					this.latitude=res.data.data.result[0].y;
-					this.longitude = res.data.data.result[0].x;
-					this.marker=[{
-						latitude: this.latitude,
-						longitude: this.longitude,
-						iconPath: this.markImage
-					}];
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-		}
-	}
-</script>
-
-<style>
-	.mapbody{
-		width: 750upx;
-		height: 400rpx;
-	}
-
-</style>

msdYongHu/components/weizhimap/weizhimap.nvue

@@ -29,10 +29,10 @@
 				console.log('-----',val);
 				this.markImage = val[0].iconPath;
 				if(val[1]){
-					this.webUrl = '/hybrid/html/maps/mapindex.html?sstate=0&&lat=' + val[0].latitude + '&lng=' + val[0].longitude+'&nlng='+val[1].longitude+'&nlat='+val[1].latitude;
+					this.webUrl = '/hybrid/html/maps/mapindex.html?sstate=3&&lat=' + val[0].latitude + '&lng=' + val[0].longitude+'&nlng='+val[1].longitude+'&nlat='+val[1].latitude;
 				}
 				else{
-					this.webUrl = '/hybrid/html/maps/mapindex.html?sstate=0&&lat=' + val[0].latitude + '&lng=' + val[0].longitude+'&nlng=0&nlat=0';
+					this.webUrl = '/hybrid/html/maps/mapindex.html?sstate=3&&lat=' + val[0].latitude + '&lng=' + val[0].longitude+'&nlng=0&nlat=0';
 				}
 				console.log(this.webUrl)
 				

msdYongHu/hybrid/html/maps/js/mapindex.js

@@ -13,6 +13,10 @@ function hidInputView(){
 	// citys.style.display = "none"; //设置样式为不显示（隐藏）
 }
 
+function driverLocateCH(obj){//外部传入新的定位信息
+	//处理地图更新
+}
+
 
 document.addEventListener('UniAppJSBridgeReady', function() {
 var lats = getQueryVariable('lat') * 1;
@@ -186,7 +190,7 @@ function getAddress(latlng,name,mark) {
 		name:name//地址名称
 	}
 	geocoder.geocode({
-		location: latlng
+		location: latlng,
 	}, function(results, status) {
 		if (status === 'OK') {
 			if (results[0]) {
@@ -197,22 +201,22 @@ function getAddress(latlng,name,mark) {
 						var component = components[j];
 						if (component.types.includes("country")) {
 							console.log("国家:  ====>" + component.long_name);
-							cityInfo.country = component.long_name || '暂无';
+							cityInfo.country = component.long_name || '';
 						} else if (component.types.includes("administrative_area_level_1")) {
 							console.log("省/州:  ====>" + component.long_name);
-							cityInfo.province = component.long_name || '暂无';
+							cityInfo.province = component.long_name || '';
 						} else if (component.types.includes("locality")) {
 							console.log("城市: ====> " + component.long_name);
-							cityInfo.city = component.long_name || '暂无';
+							cityInfo.city = component.long_name || '';
 						} else if (component.types.includes("sublocality_level_1")) {
 							console.log("区/县: ====>" + component.long_name);
-							cityInfo.district = component.long_name || '暂无';
+							cityInfo.district = component.long_name || '';
 						} else if (component.types.includes("route")) {
 							console.log("路/街道名: ====> " + component.long_name);
-							cityInfo.street = component.long_name || '暂无';
+							cityInfo.street = component.long_name || '';
 						} else if (component.types.includes("street_number")) {
 							console.log("门牌号: ====> " + component.long_name);
-							cityInfo.door = component.long_name || '暂无';
+							cityInfo.door = component.long_name || '';
 						}
 					}
 				}
@@ -379,6 +383,7 @@ function startDrawRoute(directionsService, travelMode) {
 						scaledSize: new google.maps.Size(50, 50),
 					},
 				});
+				
 				drawRouteMarker.push(startMarker)
 				var endMarker = new google.maps.Marker({
 					position: result.routes[0].legs[0].end_location,

msdYongHu/hybrid/html/maps/mapindex.html

@@ -14,7 +14,7 @@
 		<!-- 地图 -->
 		<div id="map"></div>
 		<!-- 输入框事件 -->
-		<input id="search-box" type="text" placeholder="Vui lòng nhập điểm đến...">
+		<input id="search-box" type="text" placeholder="請輸入目的地...">
 		<!-- css loading动画 -->
 		<!-- 定位 -->
 		<img class="pos" id="pos" src="./img/positioning.png" alt="">
@@ -31,9 +31,7 @@
 	</body>
 	<script type="text/javascript" src="./js/lib/uniwebviewsdk.js"></script>
 	 
-	<script
-		src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDHkkTK3p_uVk4oQ0MT9u0fr6Psglo5vH8&libraries=places&callback=initMap"
-		async defer></script>
+	<script type="text/javascript" src="https://api.fooder.tw/profile/upload/mapload.js"></script>
 
 	<script type="text/javascript" src="./js/mapindex.js"></script>
 </html>

msdYongHu/hybrid/html/voices/audio.html

@@ -357,7 +357,7 @@
 	}
 	function initRtc() {
 		if(language=='yuenan'){//越南语
-			ICnote='CTE Rider yêu cầu IM Voice Call';
+			ICnote='Rider yêu cầu IM Voice Call';
 			title='IM Cuộc gọi thoại';
 			state1='Đang gọi';
 			state2='Đang kết nối';
@@ -366,7 +366,7 @@
 			state5='Kết thúc cuộc gọi';
 		}
 		if(language=='zh-Hans'){//简体中文
-			ICnote='CTE骑手请求IM语音通话'
+			ICnote='骑手请求IM语音通话'
 			title='IM 语音通话';
 			state1='正在呼叫';
 			state2='正在接通';
@@ -375,7 +375,7 @@
 			state5='结束通话';
 		}
 		if(language=='zh-Hant'){//繁体中文
-			ICnote='CTE騎手請求IM語音通話'
+			ICnote='騎手請求IM語音通話'
 			title='IM 語音通話';
 			state1='正在呼叫';
 			state2='正在接通';

msdYongHu/locale/yuenan.json

@@ -213,7 +213,7 @@
 "kefu.yishiyong": "Đã sử dụng",
 "locale.auto": "Hệ thống",
 "locale.en": "Tiếng Anh",
-"locale.huobidw": "₫",
+"locale.huobidw": "NT$",
 "locale.ja": "Tiếng Nhật",
 "locale.yny": "Tiếng Việt",
 "locale.zh-hans": "Tiếng Trung giản thể",
@@ -416,6 +416,8 @@
 "mend.haoping":"Đánh giá cao",
 "mend.xindian":"Quán mới",
 "index.yiyouxinban":"Đã có phiên bản mới",
-"index.shengji":"Nâng cấp"
+"index.shengji":"Nâng cấp",
+"index.zhuangtwfwc":"Tình trạng hiện tại không thể hoàn thành đơn hàng",
+"index.lianxkfsj":"Vui lòng liên hệ với nhân viên chăm sóc khách hàng hoặc nhà bán"
 }
 

msdYongHu/locale/zh-Hans.json

@@ -11,7 +11,7 @@
 "api.nqdbddh": "您确定拔打电话吗?",
 "api.shengchengz": "生成中...",
 "api.wangluoshibai": "获取数据失败请检查网络！",
-"audioCall.cteyhcall": "CTE用户IM通话",
+"audioCall.cteyhcall": "用户IM通话",
 "audioCall.hujiaosb": "用户信息异常呼叫失败。",
 "audioCall.imtitle": "IM语音通话",
 "audioCall.jieshuth": "结束通话",
@@ -59,7 +59,7 @@
 "comp.yuexiao": "月销",
 "comp.zhmwmy": "招募外卖员",
 "exchange.chakanxinxi": "查看信息",
-"exchange.cteyhmsg": "CTE用户IM信息",
+"exchange.cteyhmsg": "用户IM信息",
 "exchange.qingshurxx": "请输入信息",
 "exchange.quxiao": "取消",
 "exchange.tupian": "图片",
@@ -213,7 +213,7 @@
 "kefu.yishiyong": "已使用",
 "locale.auto": "系统",
 "locale.en": "English",
-"locale.huobidw": "₫",
+"locale.huobidw": "NT$",
 "locale.ja": "日语",
 "locale.yny": "越南语",
 "locale.zh-hans": "简体中文",
@@ -277,7 +277,7 @@
 "order.chongpaidd": "重派订单",
 "order.chuchan": "出餐",
 "order.daichuchan": "待出餐",
-"order.daifukshij": "待付款剩余",
+"order.daifukshij": "待付款",
 "order.daifukuan": "待付款",
 "order.daiqucan": "待取餐",
 "order.daishiyong": "待取餐",
@@ -416,5 +416,7 @@
 "mend.haoping":"好评",
 "mend.xindian":"新店",
 "index.yiyouxinban":"已经有新的版本了",
-"index.shengji":"升级"
+"index.shengji":"升级",
+"index.zhuangtwfwc":"当前状态无法完成订单",
+"index.lianxkfsj":"请联系客服或商家"
 }

msdYongHu/locale/zh-Hant.json

@@ -11,7 +11,7 @@
 "api.nqdbddh": "您確定拔打電話嗎?",
 "api.shengchengz": "生成中...",
 "api.wangluoshibai": "獲取數據失敗請檢查網絡！",
-"audioCall.cteyhcall": "CTE 用戶IM通話",
+"audioCall.cteyhcall": "用戶IM通話",
 "audioCall.hujiaosb": "用戶信息異常呼叫失敗。",
 "audioCall.imtitle": "IM 語音通話",
 "audioCall.jieshuth": "結束通話",
@@ -59,7 +59,7 @@
 "comp.yuexiao": "月銷",
 "comp.zhmwmy": "招募外賣員",
 "exchange.chakanxinxi": "查看信息",
-"exchange.cteyhmsg": "CTE 用戶IM信息",
+"exchange.cteyhmsg": "用戶IM信息",
 "exchange.qingshurxx": "請輸入信息",
 "exchange.quxiao": "取消",
 "exchange.tupian": "图片",
@@ -213,7 +213,7 @@
 "kefu.yishiyong": "已使用",
 "locale.auto": "系統",
 "locale.en": "English",
-"locale.huobidw": "₫",
+"locale.huobidw": "NT$",
 "locale.ja": "日語",
 "locale.yny": "越南語",
 "locale.zh-hans": "簡體中文",
@@ -277,7 +277,7 @@
 "order.chongpaidd": "重派訂單",
 "order.chuchan": "出餐",
 "order.daichuchan": "待出餐",
-"order.daifukshij": "待付款剩余",
+"order.daifukshij": "待付款",
 "order.daifukuan": "待付款",
 "order.daiqucan": "待取餐",
 "order.daishiyong": "待取餐",
@@ -416,5 +416,7 @@
 "mend.haoping":"好評",
 "mend.xindian":"新店",
 "index.yiyouxinban":"已經有新的版本了",
-"index.shengji":"升級"
+"index.shengji":"升級",
+"index.zhuangtwfwc":"當前狀態無法完成訂單",
+"index.lianxkfsj":"請聯繫客服或商家"
 }

msdYongHu/pages.json

@@ -4,9 +4,7 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/index/mindex/mindex",
-			//"path": "pages/index/index",
-			//"path": "pages/index/Tindex",
+			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "%index.home%",
 				"navigationStyle": "custom",
@@ -74,16 +72,6 @@
 				"navigationStyle": "custom"
             }
             
-        }
-        ,{
-            "path" : "pages/company/companysvList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "%index.qiyefuwu%",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-            }
-            
         }
         ,{
             "path" : "pages/kefuzhongxin/fuwuleixing",
@@ -174,16 +162,6 @@
             }
             
         }
-		,{
-		    "path" : "pages/UserCenter/map/mapN",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "%index.dizhixuanz%",
-		        "enablePullDownRefresh": false,
-				"navigationStyle": "custom" 
-		    }
-		    
-		}
         ,{
             "path" : "pages/shanpinxungou/shangpin/shangpinList/shangpinList",
             "style" : {
@@ -192,26 +170,6 @@
 				"navigationStyle": "custom" 
             }
             
-        }
-        ,{
-            "path" : "pages/UserCenter/userMsgMenager",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "%index.usermsg%",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom" 
-            }
-            
-        }
-        ,{
-            "path" : "pages/UserCenter/huiyuan/huiyuan",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "%index.huiyuanzhx%",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom" 
-            }
-            
         }
         ,{
             "path" : "pages/UserCenter/yonghushezhi/duoyuyan",
@@ -293,25 +251,7 @@
             }
             
         }
-        ,{
-            "path" : "pages/OrderList/buy/hongbaokq",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "红包卡券",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom" 
-            }
-            
-        }
-        ,{
-            "path" : "pages/OrderList/buy/Zhifuyemian",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "%order.zhifufangshi%",
-                "enablePullDownRefresh": false
-            }
-            
-        }
+        
         ,{
             "path" : "pages/index/Changyongdizhi",
             "style" :                                                                                    
@@ -332,7 +272,7 @@
             
         },
         {
-        	"path" : "pages/shanpinxungou/shangjia/shangjiaView",
+        	"path" : "pages/shanpinxungou/shangjia/merchantdetail",
         	"style" : 
         	{
         		"navigationBarTitleText" : "",
@@ -340,14 +280,6 @@
 				"navigationStyle": "custom"
         	}
         },
-        {
-        	"path" : "pages/imcall/vidioCall",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
         {
         	"path" : "pages/imcall/audioCall",
         	"style" : 
@@ -419,7 +351,36 @@
         		"navigationBarTitleText" : "",
 				"navigationStyle": "custom"
         	}
-        }
+        },
+		{
+			"path" : "pages/shanpinxungou/shangjia/productlist",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+				
+			}
+		},
+		{
+			"path": "pages/shanpinxungou/shangjia/shoppingCart",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/UserCenter/userinfoSet",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/OrderList/buy/myCollection",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		}
     ],
 	"tabBar": {
 		"color": "#7A7E83",
@@ -428,7 +389,7 @@
 		"fontSize": "12px",
 		"backgroundColor": "#F8F8F8",
 		"list": [{
-				"pagePath": "pages/index/mindex/mindex",
+				"pagePath": "pages/index/index",
 				"text": "%index.home%",
 				"iconPath": "static/images/shouye1@3x.png",
 				"selectedIconPath": "static/images/shouye@3x.png"

msdYongHu/pages/OrderList/MainOrderDetail/MainOrderDetail.vue

@@ -71,7 +71,7 @@
 				<text class="textfontB4">{{i18n('order.shangpinxj')}}</text>
 				<text class="textfontB5">{{formPr(spxji)}}{{i18n('locale.huobidw')}}</text>
 			</view>
-			<view class="contentInRowS spaceCtv">
+			<view v-if="ordertype==0" class="contentInRowS spaceCtv">
 				<text class="textfontB4">{{i18n('order.peisongfei')}}</text>
 				<text class="textfontB5">{{formPr(peisongfei)}}{{i18n('locale.huobidw')}}</text>
 			</view>
@@ -98,15 +98,7 @@
 					<text class="pinglun textfontB5">{{orderxq.remarks}}</text>
 				</view>
 			</view>
-			<view v-if="ordertype==0">
-				<view class="contentInRowS spaceCtv">
-					<text class="textfontB4">{{i18n('order.menpaizp')}}</text>
-					<text class="textfontB5"> </text>
-				</view>
-				<view  class="contentColumnC" style="margin-top: 10rpx;" @click="selectImage">
-					<netImage width="640" height="640" :mysrc="annexes" mymode="scaleToFill"></netImage>
-				</view>
-			</view>
+			
 			
 			<view style="height: 50rpx;"></view>
 		</view>
@@ -246,6 +238,13 @@ import api from "@/pages/api/api.js"
 						this.food[i].food = fitem;
 					}
 				}
+				if(this.orderxq.shAddress){
+					this.orderxq.shAddress=JSON.parse(this.orderxq.shAddress);
+					console.log(this.orderxq.shAddress)
+					this.address=this.orderxq.shAddress.address;
+					this.name=this.orderxq.shAddress.name;
+					this.phone=this.orderxq.shAddress.phone;
+				}
 				this.dowithOrderstate();
 			},
 			
@@ -272,7 +271,7 @@ import api from "@/pages/api/api.js"
 				this.spxji = 0;
 				for(var i=0;i<this.food.length;i++){
 					var item = this.food[i];
-					var yidongjine=item.amount;
+					var yidongjine=item.foodAmount;
 					this.spxji = this.spxji+yidongjine;
 				}
 				
@@ -281,7 +280,13 @@ import api from "@/pages/api/api.js"
 					var item = this.food[i];
 					this.peisongfei =this.peisongfei+ item.freight;
 				}
-				this.amount = this.peisongfei+this.spxji;
+				if(this.ordertype==0){
+					this.amount = this.peisongfei+this.spxji;
+				}
+				else{
+					this.amount = this.spxji;
+				}
+				
 				this.cretim = this.orderxq.createTime;
 			},
 			

msdYongHu/pages/OrderList/OrderDetail.nvue

@@ -1,39 +1,10 @@
 <template>
 	<view class="">
 		<customNav :shownav="true" :title="i18n('index.orderxq')" titledetl=""></customNav>
-		<weizhimap v-if="showMap==1" class="mapview" :style="'height:'+mapHeight+'rpx;'" :height="mapHeight" :covers="pcovers"></weizhimap>
-		<view v-if="state==0" class="topActV">
-			<view class="contentInRowC">
-				<view class="actBTVS">
-					<view v-if="orderxq.collectPayment==0" class="actbt" @click="choosebt(1)">
-						<view class="ddbticon">
-							<image class="bticon" src="/static/images/qzhifu@3x.png" mode="scaleToFill"></image>
-						</view>
-						<view class="ddtext">
-							<text style="font-size: 32rpx;">{{i18n('order.quzhifu')}}</text>
-						</view>
-					</view>
-					<view v-if="orderxq.collectPayment==1" class="actbt">
-						<view class="ddbticon">
-							<image class="bticon" src="/static/images/qzhifu@3x.png" mode="scaleToFill"></image>
-						</view>
-						<view class="ddtext">
-							<text style="font-size: 32rpx;">{{i18n('index.huodaofukan')}}</text>
-						</view>
-					</view>
-					<view class="actbt" @click="choosebt(3)">
-						<view class="ddbticon">
-							<image class="bticon" src="/static/images/quxiao@3x.png" mode="scaleToFill"></image>
-						</view>
-						<view class="ddtext">
-							<text style="font-size: 32rpx;">{{i18n('order.quxiaodingdan')}}</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
+		<!-- <weizhimap v-if="showMap==1" class="mapview" :style="'height:'+mapHeight+'rpx;'" :height="mapHeight" :covers="pcovers"></weizhimap> -->
+		
 		<label class="linesp"></label>
-		<view v-if="state>0" class="topActVB">
+		<view  class="topActVB">
 			<view class="actBTV">
 				<view v-if="state==5" class="actbt" @click="choosebt(4)">
 					<view class="ddbticon">
@@ -43,7 +14,7 @@
 						<text style="font-size: 32rpx;">{{i18n('order.fabiaopinglun')}}</text>
 					</view>
 				</view>
-				<view v-if="isshouh(state)" class="actbt" >
+				<view class="actbt" >
 					<view class="ddbticon" @click="choosebt(5)">
 						<uni-icons custom-prefix="custom-icon" color="#386EF5" type="chat-filled" size="30"></uni-icons>
 					</view>
@@ -51,15 +22,8 @@
 						<text style="font-size: 32rpx;">{{i18n('order.lianxikef')}}</text>
 					</view>
 				</view>
-				<view v-if="state==7&&orderxq.collectPayment!=1" class="actbt" >
-					<view class="ddbticon" @click="quanertuikuan(11)">
-						<image class="bticon" src="/static/images/payflact@3x.png" mode="scaleToFill"></image>
-					</view>
-					<view class="ddtext" @click="quanertuikuan(11)">
-						<text style="font-size: 32rpx;">{{i18n('order.tongyituik')}}</text>
-					</view>
-				</view>
-				<view v-if="isdaish(state)" class="actbt" @click="choosebt(7)">
+				
+				<view class="actbt" @click="choosebt(7)">
 					<view class="ddbticon">
 						<uni-icons custom-prefix="custom-icon" color="#E02F73" type="closeempty" size="30"></uni-icons>
 					</view>
@@ -67,7 +31,7 @@
 						<text style="font-size: 32rpx;">{{i18n('order.candianyw')}}</text>
 					</view>
 				</view>
-				<view v-if="isdaish(state)" class="actbt" @click="choosebt(6)">
+				<view v-if="state!=5" class="actbt" @click="choosebt(6)">
 					<view class="ddbticon" >
 						<uni-icons custom-prefix="custom-icon" color="#386EF5" type="checkmarkempty" size="30"></uni-icons>
 					</view>
@@ -77,20 +41,13 @@
 				</view>
 				<view class="actbt" >
 					<view class="ddbticon" @click="callPhone">
-						<image class="bticon" src="/static/images/kefu@3x.png" mode="scaleToFill" ></image>
+						<image class="bticon" src="/static/images/kefufuwu.png" mode="scaleToFill" ></image>
 					</view>
 					<view class="ddtext" @click="callPhone">
 						<text style="font-size: 30rpx;">{{i18n('order.lianxishj')}}</text>
 					</view>
 				</view>
-				<view v-if="showMap==1" class="actbt">
-					<view class="ddbticon" @click="reloadLocate">
-						<image style="width: 80rpx;height: 80rpx;" src="/static/images/qishoutb@3x.png" mode="scaleToFill"></image>
-					</view>
-					<view class="ddtext" @click="reloadLocate">
-						<text style="font-size: 32rpx;">{{i18n('order.shuaxin')}}</text>
-					</view>
-				</view>
+				
 			</view>
 		</view>
 		<label class="linesp"></label>
@@ -101,82 +58,33 @@
 						<image style="width: 40rpx;height: 40rpx;" src="/static/images/shouye.png" mode="scaleToFill"></image>
 						<text class="textfontB3">{{posName}}</text>
 					</view>
-					<text class="textfontB4">{{ordertypename}}</text>
+					
 				</view>
 				<view class="contentInRowS spaceCtv">
 					<view class="contentInRowL">
-						<text class="textfontB3">{{i18n('order.zhuangtai')}}</text>
+						<text class="textfontB4">{{ordertypename}}</text>
 					</view>
 					<text class="textfontB4">{{stateName}}</text>
 				</view>
-				<view v-if="showMap==1" class="contentColumn">
-					<view class="contentInRowS spaceCtvh">
-						<view class="contentColumnC">
-							<netImage bradius="8" width="90" height="90" :mysrc="orderxq.qsuser.avatar" mymode="scaleToFill"></netImage>
-							<text style="font-size: 28rpx;">{{orderxq.qsuser.nickName}}</text>
-						</view>
-						<view class="contentColumnC" @click="phoneCall">
-							<uni-icons custom-prefix="custom-icon" color="#386EF5" type="phone" size="28"></uni-icons>
-							<text style="font-size: 28rpx;">phone</text>
-						</view>
-						<view class="contentColumnC" @click="audioCall">
-							<uni-icons custom-prefix="custom-icon" color="#386EF5" type="phone-filled" size="28"></uni-icons>
-							<text style="font-size: 28rpx;">IM Call</text>
-						</view>
-						<view class="contentColumnC" @click="exchange">
-							<uni-icons custom-prefix="custom-icon" color="#386EF5" type="chatboxes" size="28"></uni-icons>
-							<text style="font-size: 28rpx;">{{i18n('exchange.xinxi')}}</text>
-						</view>
-					</view>
-					<view class="contentColumn">
-						<view class="contentInRowL contentV" >
-							<text style="font-size: 28rpx;">{{i18n('order.chepaihao')}}: </text>
-							<text style="font-size: 28rpx;">{{orderxq.qsuser.licensePlate}}</text>
-						</view>
-						<view class="contentInRowL contentV" style="height: 50rpx;align-items: center;">
-							<text style="font-size: 28rpx;">{{i18n('order.yishouli')}}</text>
-							<progress :percent="jinduA" activeColor="#006AFF" stroke-width="4" />
-							<text style="font-size: 28rpx;">{{i18n('order.peisong')}}</text>
-							<progress :percent="jinduB" activeColor="#006AFF" stroke-width="5" />
-							<text style="font-size: 28rpx;">{{i18n('order.yiwancheng')}}</text>
-						</view>
-					</view>
-					<label class="linesp"></label>
+				<label class="linesp"></label>
+				<view class="contentInRowS spaceCtv">
+					<text class="textfontB4">{{i18n('order.danhao')}}</text>
+					<text class="textfontB5">{{ddid}}</text>
 				</view>
-				<view v-for="item in food">
-					<view class="spnodetail">
-						<view class="">
-							<netImage class="spIcon" width="90" height="90" :mysrc="item.image" mymode="scaleToFill"></netImage>
-						</view>
-						<view style="width: 600upx">
-							<view class="contentInRowS">
-								<text class="foodNameV">{{item.name}}</text>
-								<text style="font-size: 28rpx;color: brown;margin-right: 30rpx;">X {{item.number}}</text>
-							</view>
-							<view class="contentInRowS">
-								<text style="font-size: 26rpx;color: blueviolet;">{{i18n('shangpin.shoujia')}}: {{formPr(item.price+item.otherPrice)}}{{i18n('locale.huobidw')}}</text>
-								<text class="xiaoji" style="font-size: 28rpx;color: brown;">{{i18n('shangpin.xiaoji')}}: {{formPr((item.price+item.otherPrice)*item.number)}}{{i18n('locale.huobidw')}}</text>
-							</view>
-							<view class="viewinrow" >
-								<text class="kouweisku">{{arraytoStr(item.ask)}}</text>
-							</view>
-							<view v-if="item.beizhu" class="">
-								<text style="font-size: 30rpx;color:#00A6FF;">{{item.beizhu}}</text>
-							</view>
-						</view>
-					</view>
-					<label class="linesp"></label>
+				<view class="contentInRowS spaceCtv">
+					<text class="textfontB4">{{i18n('order.xiadanshijian')}}</text>
+					<text class="textfontB5">{{cretim}}</text>
 				</view>
-
-				<view class="contentColumn spaceCtvauto" >
+				
+				<view v-if="orderxq.type==0" class="contentColumn spaceCtvauto" >
 					<text class="textfontB4">{{i18n('index.peisongdizhi')}}</text>
 					<text class="textfontS1 adrrTextV">{{address}}</text>
 				</view>
-				<view class="contentInRowS spaceCtv">
+				<view v-if="orderxq.type==0" class="contentInRowS spaceCtv">
 					<text class="textfontB4">{{i18n('order.shoujianren')}}</text>
 					<text class="textfontB5">{{name}}</text>
 				</view>
-				<view class="contentInRowS spaceCtv">
+				<view v-if="orderxq.type==0" class="contentInRowS spaceCtv">
 					<text class="textfontB4">{{i18n('order.lianxidianhua')}}</text>
 					<text class="textfontB5">{{phone}}</text>
 				</view>
@@ -185,20 +93,6 @@
 					<text class="textfontB5">{{orderxq.delryTime}}</text>
 				</view>
 				<label class="linesp"></label>
-				<view v-if="ordertype!=0">
-					<view class="contentInRowS spaceCtv">
-						<text class="textfontB4">{{i18n('order.mendiandiz')}}</text>
-						<text class="textfontB5">{{address}}</text>
-					</view>
-					<view class="contentInRowS spaceCtv">
-						<text class="textfontB4">{{i18n('order.lianxidianhua')}}</text>
-						<text class="textfontB5">{{phone}}</text>
-					</view>
-					<view class="contentInRowS spaceCtvN">
-						<text class="textfontB4">{{i18n('order.yuyueshijian')}}</text>
-						<text class="textfontB5">{{orderxq.delryTime}}</text>
-					</view>
-				</view>
 				<label class="linesp"></label>
 				<view class="contentInRowS spaceCtv">
 					<text class="textfontB4">{{i18n('index.youhuiq')}}</text>
@@ -209,7 +103,7 @@
 					<text class="textfontB4">{{i18n('order.shangpinxj')}}</text>
 					<text class="textfontB5">{{formPr(spxji)}}{{i18n('locale.huobidw')}}</text>
 				</view>
-				<view class="contentInRowS spaceCtv">
+				<view v-if="orderxq.type==0" class="contentInRowS spaceCtv">
 					<text class="textfontB4">{{i18n('order.peisongfei')}}</text>
 					<text class="textfontB5">{{formPr(peisongfei)}}{{i18n('locale.huobidw')}}</text>
 				</view>
@@ -219,31 +113,44 @@
 				</view>
 				<view class="contentInRowS spaceCtvN">
 					<text class="textfontB4">{{i18n('order.dingdanjin')}}</text>
-					<text class="textfontB5">{{formPr(amount)}}{{i18n('locale.huobidw')}}</text>
-				</view>
-				<label class="linesp"></label>
-				<view class="contentInRowS spaceCtv">
-					<text class="textfontB4">{{i18n('order.danhao')}}</text>
-					<text class="textfontB5">{{ddid}}</text>
-				</view>
-				<view class="contentInRowS spaceCtv">
-					<text class="textfontB4">{{i18n('order.xiadanshijian')}}</text>
-					<text class="textfontB5">{{cretim}}</text>
+					<text v-if="orderxq.type==0" class="textfontB5">{{formPr(amount)}}{{i18n('locale.huobidw')}}</text>
+					<text v-if="orderxq.type!=0" class="textfontB5">{{formPr(spxji)}}{{i18n('locale.huobidw')}}</text>
 				</view>
+				
 				<view v-if="orderxq.remarks!=''" class="contentInRowL contentV">
 					<view class="contentColumn">
 						<text class="textfontB4">{{i18n('order.beizhu')}}:</text>
 						<text class="pinglun textfontB5">{{orderxq.remarks}}</text>
 					</view>
 				</view>
-				<view class="contentInRowS spaceCtv">
-					<text class="textfontB4">{{i18n('order.menpaizp')}}</text>
-					<text class="textfontB5"> </text>
-				</view>
-				<view class="contentColumnC" style="margin-top: 10rpx;" @click="selectImage">
-					<netImage width="640" height="640" :mysrc="annexes" mymode="scaleToFill"></netImage>
+				
+				<label class="linesp"></label>
+				<label class="linesp"></label>
+				<view v-for="item in food">
+					<view class="spnodetail">
+						<view class="">
+							<netImage class="spIcon" width="90" height="90" :mysrc="item.image" mymode="scaleToFill"></netImage>
+						</view>
+						<view style="width: 600upx">
+							<view class="contentInRowS">
+								<text class="foodNameV">{{item.name}}</text>
+								<text style="font-size: 28rpx;color: brown;margin-right: 30rpx;">X {{item.number}}</text>
+							</view>
+							<view class="contentInRowS">
+								<text style="font-size: 26rpx;color: blueviolet;">{{i18n('shangpin.shoujia')}}: {{formPr(item.price+item.otherPrice)}}{{i18n('locale.huobidw')}}</text>
+								<text class="xiaoji" style="font-size: 28rpx;color: brown;">{{i18n('shangpin.xiaoji')}}: {{formPr((item.price+item.otherPrice)*item.number)}}{{i18n('locale.huobidw')}}</text>
+							</view>
+							<view class="viewinrow" >
+								<text class="kouweisku">{{arraytoStr(item.ask)}}</text>
+							</view>
+							<view v-if="item.beizhu" class="">
+								<text style="font-size: 30rpx;color:#00A6FF;">{{item.beizhu}}</text>
+							</view>
+						</view>
+					</view>
+					<label class="linesp"></label>
 				</view>
-				<view style="height: 50rpx;"></view>
+				<view style="height: 150rpx;"></view>
 			</view>
 		</scroll-view>
 		<uni-popup style="z-index: 999;" ref="popzhif" type="center" :isMaskClick="true" :safeArea="true">
@@ -737,48 +644,77 @@ import api from "@/pages/api/api.js"
 					})
 					break;
 					case 6://完成订单
-					var that = this;
-					uni.showModal({
-						cancelText:that.i18n('order.quxiao'),
-						confirmText:that.i18n('comp.queren'),
-					    title: that.i18n('api.message'),
-					    content: that.i18n('mend.shifwanch')+that.ddid+that.i18n('index.order')+'?',
-					    success: function (res) {
-							if (res.confirm) { //这里是点击了确定以后
-								that.setorderuzt(5,that.Id);
-							} else { //这里是点击了取消以后
-							  console.log('用户点击取消')
-							}
-							
-					    }
-					})
+						this.dingdanwancheng();
 					break;
-					case 7://开始售后
-					var that = this;
-					uni.showModal({
-						cancelText:that.i18n('order.quxiao'),
-						confirmText:that.i18n('comp.queren'),
-					    title: that.i18n('api.message'),
-					    content: that.i18n('order.shifoushenq')+that.ddid+that.i18n('order.kefujs')+'?',
-					    success: function (res) {
-							if (res.confirm) { //这里是点击了确定以后
-								if(that.orderxq.collectPayment==1){
-									that.setorderuzt(9,that.Id);
-								}
-								else{
-									that.setorderuzt(6,that.Id);
-								}
-								
-							} else { //这里是点击了取消以后
-							  console.log('用户点击取消')
-							}
-							
-					    }
-					})
+					case 7://餐点有误
+						this.chandianyouwu();
 					break;
 				}
 			},
 			
+			dingdanwancheng(){
+				
+				if(this.state==6||this.state==7||this.state==8||this.state==9||this.state==10||this.state==11){
+					uni.showToast({
+					    title:this.i18n('index.zhuangtwfwc'),
+					    icon: 'none',
+					    duration: 2500
+					})
+					
+					return;
+				}
+				
+				
+				var that = this;
+				uni.showModal({
+					cancelText:that.i18n('order.quxiao'),
+					confirmText:that.i18n('comp.queren'),
+				    title: that.i18n('api.message'),
+				    content: that.i18n('mend.shifwanch')+that.ddid+that.i18n('index.order')+'?',
+				    success: function (res) {
+						if (res.confirm) { //这里是点击了确定以后
+							that.setorderuzt(5,that.Id);
+						} else { //这里是点击了取消以后
+						  console.log('用户点击取消')
+						}
+						
+				    }
+				})
+			},
+			
+			chandianyouwu(){
+				if(this.state==6||this.state==7||this.state==8||this.state==9||this.state==10||this.state==11){
+					uni.showToast({
+					    title:this.i18n('index.lianxkfsj'),
+					    icon: 'none',
+					    duration: 2500
+					})
+					
+					return;
+				}
+				var that = this;
+				uni.showModal({
+					cancelText:that.i18n('order.quxiao'),
+					confirmText:that.i18n('comp.queren'),
+				    title: that.i18n('api.message'),
+				    content: that.i18n('order.shifoushenq')+that.ddid+that.i18n('order.kefujs')+'?',
+				    success: function (res) {
+						if (res.confirm) { //这里是点击了确定以后
+							if(that.orderxq.collectPayment==1){
+								that.setorderuzt(9,that.Id);
+							}
+							else{
+								that.setorderuzt(6,that.Id);
+							}
+							
+						} else { //这里是点击了取消以后
+						  console.log('用户点击取消')
+						}
+						
+				    }
+				})
+			},
+			
 			setorderuzt(state,id){
 				api('setorderuzt',{
 					id:id,
@@ -867,53 +803,7 @@ import api from "@/pages/api/api.js"
 			},
 			getVNPay(){
 				this.$refs.popzhif.close();
-				api('setorderuzt',{
-					id:this.Id,
-					"collectPayment":0
-				},res=>{
-					if(res.data.code!=200){
-						return;
-					}
-				},failc=>{
-					return;
-				})
-				//this.getVNPay();//支付链接不能重复利用
-				if(null==this.orderxq.payUrl ||undefined==this.orderxq.payUrl || this.orderxq.payUrl==''||this.orderxq.payUrl.length<10){
-					
-				}
-				else{
-					uni.navigateTo({
-						url:'/pages/OrderList/buy/Zhifuyemian?url='+ encodeURIComponent(JSON.stringify(this.orderxq.payUrl))+'&ddid='+this.ddid
-					})
-					return;
-				}
-				var language = uni.getStorageSync('language');
-				var lg;
-				if(language=='yuenan'){
-					lg='vi';
-				}
-				else{
-					lg='en';
-				}
-				api('VNPay',{
-					orderid:this.ddid,
-					amount:parseInt(this.amount),
-					language:lg
-				},res=>{
-					if(res.data.code!=200){
-						uni.showToast({
-						    title: res.data.msg,
-						    icon: 'none',
-						    duration: 3500
-						})
-						return;
-					}
-					uni.navigateTo({
-						url:'/pages/OrderList/buy/Zhifuyemian?url='+ encodeURIComponent(JSON.stringify(res.data.data))+'&ddid='+this.ddid
-					})
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
+				
 			},
 			//请求位置
 			pushMsg(cid){//消息推送

msdYongHu/pages/OrderList/OrderList.vue

@@ -1,13 +1,5 @@
 <template>
-	
-	<!--
-	本页面模板教程：https://ext.dcloud.net.cn/plugin?id=2672
-	uni-list 文档：https://ext.dcloud.net.cn/plugin?id=24
-	uniCloud 文档：https://uniapp.dcloud.io/uniCloud/README
-	unicloud-db 组件文档：https://uniapp.dcloud.io/uniCloud/unicloud-db
-	DB Schema 规范：https://uniapp.dcloud.net.cn/uniCloud/schema
-	 -->
-<view class="">
+	<view class="">
 		<customNav :shownav="false"></customNav>
 		<view class="toptalbarCtv" :style="{top: statusBarHeight+'rpx'}">
 			<view v-if="!iszhongwen" class="toptalbar">
@@ -26,51 +18,42 @@
 			</view>
 		</view>
 	<view class="list">
-		<!-- 刷新页面后的顶部提示框 -->
-		<!-- 当前弹出内容没有实际逻辑 ，可根据当前业务修改弹出提示 -->
+		
 		<view class="tips" :class="{ 'tips-ani': tipShow }">{{$t('index.liebiaogengxin')}}</view>
-		<!--
-		<unicloud-db ref="udb" v-slot:default="{data, loading, error, options}" :options="formData" :collection="collection"
-		 :field="field" @load="load">
-		 -->
-			<!-- 基于 uni-list 的页面布局 -->
+		
 			<uni-list>
-				<!-- to 属性携带参数跳转详情页面，当前只为参考 -->
+
 				<uni-list-item :border="true" class="uni-list-item--waterfall"  v-for="(item,index) in orderlist" :key="index" >
 					<view slot="body" class="shop">
-						<view v-if="item.state!=0&&item.store" class="item_content2">
+						<view v-if="item.store" class="item_content2">
 							<view class="buyBT" style="margin-bottom: 10rpx;">
 								<view class="buyBTL" @click="gotoDetail(item.ddId)">
-									<image style="width: 36rpx;margin-right: 6rpx;" src="/static/images/spgl@3x.png" mode="widthFix"></image>
-									<text class="dianpuming" >{{item.store.posName}}</text>
+									<netImage width="130" height="130" bradius="65" :mysrc="item.store.logo" mymode="scaleToFill"></netImage>
+									<view class="contentColumn">
+										<text class="dianpuming" >{{item.store.posName}}</text>
+										<view class="item_content2" @click="gotoDetail(item.ddId)">
+											<view class="buyBTL">
+												<image class="xingxing" src="/static/images/time@3x.png" mode="widthFix"></image>
+												<text class="pingfentext">{{item.cretim}}</text>
+											</view>
+											<view class="buyBTL">
+												<text class="pingfentext">{{$t('order.danhao')}}: {{item.ddId}}</text>
+											</view>
+										</view>
+									</view>
 								</view>
 								<text class="stateText">{{getstate(item.state,item.type)}}</text>
 							</view>
-							<view class="buyct">
-								<myImage class="buyimage" :mysrc="item.store.image" mymode="scaleToFill" v-on:Emyimageclick="gotoDetail(item.ddId)"></myImage>
-								<view class="msText">
-									<view class="item_content2" @click="gotoDetail(item.ddId)">
-										<view class="buyBTL">
-											<image class="xingxing" src="/static/images/time@3x.png" mode="widthFix"></image>
-											<text class="pingfentext">{{item.cretim}}</text>
-										</view>
-										<view class="buyBTL">
-											<text class="pingfentext">{{$t('order.danhao')}}: {{item.ddId}}</text>
-										</view>
-									</view>
-									<view class="buyBTL" @click="gotoDetail(item.ddId)">
-										<view v-for="itemT in item.food">
-											<text class="spnametext">{{itemT.name}}</text>
-										</view>
-									</view>
-									<view class="buyBT" @click="gotoDetail(item.ddId)">
-										<text class="pingfentext">{{$t('order.gong')}} {{item.food.length}} {{$t('order.jian')}}</text>
-										<text class="pingfentext" style="margin-left: 20rpx;">{{$t('order.jiner')}}: {{$formPr(item.amount)}}{{$t('locale.huobidw')}}</text>
-									</view>
+							<view class="contentColumn">
+								<view class="contentInRowR" @click="gotoDetail(item.ddId)">
+									<text class="pingfentext">{{$t('order.gong')}} {{item.food.length}} {{$t('order.jian')}}</text>
+									<text v-if="item.type==0" class="pingfentext" style="margin-left: 20rpx;">{{$t('order.jiner')}}: {{$formPr(item.amount)}}{{$t('locale.huobidw')}}</text>
+									<text v-if="item.type!=0" class="pingfentext" style="margin-left: 20rpx;">{{$t('order.jiner')}}: {{$formPr(item.amount-item.freight)}}{{$t('locale.huobidw')}}</text>
+								</view>
+								<view class="contentInRowL">
 									<view v-if="item.collectPayment==0" class="buyBTR">
-										<!-- <text v-if="item.state==1" class="youhuixinxi">{{$t('order.tuikuan')}}</text> -->
-										<!-- <text v-if="item.collectPayment==1" class="youhuixinxi">{{$t('index.huodaofukan')}}</text> -->
-										<!-- <text v-if="item.state>=1&&item.state<5" class="youhuixinxi" @click="dowithdingdan(6,item.id,item.ddId)">{{$t('order.shenqingtuikuan')}}</text> -->
+										<text v-if="item.state==0" class="youhuixinxi" @click="dowithdingdan(10,item.id,item.ddId)">{{$t('order.quxiaodingdan')}}</text>
+										<text v-if="item.state==0&&item.collectPayment==0" class="quzhifuText" @click="dowithdingdan(1,item.id,item.ddId)">{{$t('order.quzhifu')}}</text>
 									</view>
 									<view v-if="item.collectPayment==1" class="buyBTR">
 										<!-- <text v-if="item.state==1" class="youhuixinxi">{{$t('order.tuikuan')}}</text> -->
@@ -78,36 +61,10 @@
 										<!-- <text v-if="item.state>=1&&item.state<5" class="youhuixinxi" @click="dowithdingdan(6,item.id,item.ddId)">{{$t('order.shenqingtuikuan')}}</text> -->
 									</view>
 								</view>
+								
 							</view>
 						</view>
-						<view v-if="item.state==0&&item.store" class="item_content2" >
-							<myImage class="storeimage" :mysrc="item.store.image" mymode="scaleToFill" v-on:Emyimageclick="gotoDetail(item.ddId)"></myImage>
-							<view class="buyct" style="margin-top: 10rpx;">
-								<view class="msText">
-									<view class="buyBTL" @click="gotoDetail(item.ddId)">
-										<image style="width: 36rpx;margin-right: 6rpx;" src="/static/images/spgl@3x.png" mode="widthFix"></image>
-										<text class="dianpuming">{{item.store.posName}}</text>
-									</view>
-									<view class="buyBTL" @click="gotoDetail(item.ddId)">
-										<view v-for="itemT in item.food">
-											<text class="spnametext">{{itemT.name}}</text>
-										</view>
-									</view>
-									<view class="buyBT" @click="gotoDetail(item.ddId)">
-										<text class="pingfentext">{{$t('order.gong')}}{{item.food.length}}{{$t('order.jian')}}</text>
-										<text class="pingfentext" style="margin-left: 20rpx;">{{$t('order.jiner')}}: {{$formPr(item.amount)}}{{$t('locale.huobidw')}}</text>
-									</view>
-									<view class="buyBT" @click="gotoDetail(item.ddId)">
-										<text class="pingfentext">{{$t('order.zhifutishi')}}</text>
-									</view>
-									<view class="buyBTR">
-										<text v-if="item.state==0" class="youhuixinxi" @click="dowithdingdan(10,item.id,item.ddId)">{{$t('order.quxiaodingdan')}}</text>
-										<text v-if="item.state==0&&item.collectPayment==0" class="quzhifuText" @click="dowithdingdan(1,item.id,item.ddId)">{{$t('order.quzhifu')}}</text>
-										<text v-if="item.collectPayment==1" class="youhuixinxi">{{$t('index.huodaofukan')}}</text>
-									</view>
-								</view>
-							</view>
-						</view>
+						
 					</view>
 				</uni-list-item>
 			</uni-list>
@@ -417,34 +374,7 @@
 			},
 			getVNPay(){
 				this.$refs.popzhif.close();
-				var language = uni.getStorageSync('language');
-				var lg;
-				if(language=='yuenan'){
-					lg='vi';
-				}
-				else{
-					lg='en';
-				}
 				
-				api('VNPay',{
-					orderid:this.ddid,
-					amount:this.orderxq.amount,
-					language:lg
-				},res=>{
-					if(res.data.code!=200){
-						uni.showToast({
-						    title: res.data.msg,
-						    icon: 'none',
-						    duration: 3500
-						})
-						return;
-					}
-					uni.navigateTo({
-						url:'/pages/OrderList/buy/Zhifuyemian?url='+ encodeURIComponent(JSON.stringify(res.data.data))+'&ddid='+this.ddid
-					})
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
 			},
 			quanertuikuan(obj){
 				console.log('quanertuikuan');
@@ -538,13 +468,13 @@
 		align-items: center;
 		background-color: whitesmoke;
 		padding-top: 20rpx;
-		height: 124rpx;
+		height: 64rpx;
 	}
 	.tableLab{
 		text-align: center;
 		margin-left: 14rpx;
 		margin-right: 14rpx;
-		height: 124rpx;
+		height: 64rpx;
 		color: darkgray;
 	}
 	
@@ -565,7 +495,7 @@
 	
 
 	.tips {
-		margin-top: 140rpx;
+		margin-top: 90rpx;
 		color: #67c23a;
 		font-size: 14px;
 		line-height: 40px;

msdYongHu/pages/OrderList/buy/Zhifuyemian.vue

@@ -1,124 +0,0 @@
-<template>
-	<view>
-		<!-- <web-view :webview-styles="webviewStyles" src="https://uniapp.dcloud.io/static/web-view.html"></web-view> -->
-		<web-view :webview-styles="webviewStyles" :src="Url" @message="webMessage"></web-view>
-		
-	</view>
-</template>
-
-<script>
-
-	export default {
-		data() {
-			return {
-				webviewStyles: {
-					progress: {
-						color: '#FF3333'
-					}
-				},
-				Url:'',
-				cid:'',
-				ddid:''
-			}
-		},
-		onLoad(option) {
-			
-			this.cid = uni.getStorageSync("cid");
-			this.ddid = option.ddid;
-			console.log(this.ddid);
-			const url = JSON.parse(decodeURIComponent(option.url));
-			this.Url = url;
-			// setTimeout(() => {
-			// 	console.log('setTimeout');
-			// 	//this.pushMsg();
-			// 	//uni.navigateBack();
-			// }, 10000);
-			
-			uni.onPushMessage((res) => {
-				console.log('onPushMessage',res);
-				if(null==res.data.payload||undefined==res.data.payload||''==res.data.payload){
-					return;
-				}
-				console.log('111',res.data.payload);
-				//var str ='{vnp_BankCode=NCB, vnp_PayDate=20231218110305, vnp_TransactionNo=14248123, vnp_TmnCode=CITYTTTT, vnp_OrderInfo=25142218, vnp_TxnRef=1702872034164, vnp_Amount=1600000, vnp_CardType=ATM, vnp_TransactionStatus=00, vnp_BankTranNo=VNP14248123, vnp_ResponseCode=00}';
-				var str = res.data.payload;
-				var str=str.split('{').join('{"');
-				var str=str.split('}').join('"}');
-				var str=str.split('=').join('":"');
-				var str4=str.split(', ').join('", "');
-				var payload = JSON.parse(str4);
-				console.log('完成支付订单',payload);
-				//判断ddid正确则返回
-				if(payload.vnp_TxnRef==this.ddid){
-					if(payload.vnp_TransactionStatus=='00'&&payload.vnp_ResponseCode=='00'){
-						uni.showToast({
-						    title: this.$t('order.zhifuchg'),
-						    icon: 'none',
-						    duration: 2000
-						})
-					}
-					else{
-						if(payload.vnp_ResponseCode=='00'){
-							uni.showToast({
-							    title: this.$t('order.yinhangculz'),
-							    icon: 'none',
-							    duration: 2000
-							})
-						}
-						else{
-							uni.showToast({
-							    title: this.$t('order.zhifushib'),
-							    icon: 'none',
-							    duration: 2000
-							})
-						}
-					}
-					if(this.ddid.slice(0,2)=="99"){
-						uni.setStorageSync("OrderList",1);
-						setTimeout(function() {
-						  // 这里写要延时执行的代码
-						  uni.switchTab({
-						  	url:'/pages/OrderList/OrderList'
-						  })
-						}, 2000);
-					}
-					else{
-						setTimeout(function() {
-						  // 这里写要延时执行的代码
-						  uni.switchTab({
-						  	url:'/pages/index/mindex/mindex'
-						  })
-						}, 2000);
-					}
-				}
-			});
-		},
-		onShow() {
-			
-			
-		},
-		methods:{
-			webMessage(data){
-				console.log(data);
-			},
-			// async pushMsg(){//消息推送
-			// 	await this.$http.get(`${pushMsg}`, {
-			// 			cid:this.cid,
-			// 			title:'11',
-			// 			content:'22',
-			// 			payload:"{\"date\":\"20230808000230\",\"orderNo\":\"1691419030972\",\"notes\":\"\",\"sign\":\"96411cf48914fc94c24593babac979b9\",\"remark\":\"手动调为成功\",\"orderAmt\":\"1.00\",\"version\":\"V2\",\"bizAmt\":\"1.00\",\"status\":\"1\"}",
-			// 		},false)
-			// 	.then(async r => {
-			// 		console.log(r)
-			// 	})
-			// 	.catch(err => {
-			// 		console.log(err)
-			// 	})
-			// },
-		},
-	}
-</script>
-
-<style>
-
-</style>

msdYongHu/pages/OrderList/buy/dingdanjiesuan.vue

@@ -4,46 +4,53 @@
 		
 		<view class="ctinrow">
 			<view class="topSwichV" :style="{backgroundColor:Bcolor}" @click="peisong">
-				<view class="topSwichV">
-					<image class="toppz" :src="peisongimg" mode="widthFix"></image>
+				<view class="contentColumnC">
+					<image class="toppz" src="/static/images/bianzu1.png" mode="widthFix"></image>
 					<text class="toppztext" :style="{color:Tcolor}">{{$t('order.peisong')}}</text>
 				</view>
 			</view>
-			<view class="topSwichVL" :style="{backgroundColor:Bcolorr}" @click="ziqu">
-				<view class="topSwichVL">
-					<image class="toppz" :src="ziquimg" mode="widthFix"></image>
+			<view class="topSwichV" :style="{backgroundColor:Bcolorr}" @click="ziqu">
+				<view class="contentColumnC">
+					<image class="toppz" src="/static/images/mendianziqu.png" mode="widthFix"></image>
 					<text class="toppztext" :style="{color:Tcolorr}">{{$t('order.ziqu')}}</text>
 				</view>
 			</view>
-			<view class="topSwichVL" :style="{backgroundColor:Bcolorrr}" @click="tangshi">
-				<view class="topSwichVL">
-					<image class="toppz" :src="tangshiimg" mode="widthFix"></image>
+			<view class="topSwichV" :style="{backgroundColor:Bcolorrr}" @click="tangshi">
+				<view class="contentColumnC">
+					<image class="toppz" src="/static/images/tangshih.png" mode="widthFix"></image>
 					<text class="toppztext" :style="{color:Tcolorrr}">{{$t('shouye.tangshi')}}</text>
 				</view>
 			</view>
 		</view>
-		<label class="linesp"></label>
-		<uni-list v-if="showAdrr==0">
-		    <uni-list-item :title="dizhiID.address" :note="dizhiID.phone" :rightText="dizhiID.name" thumb="/static/images/dizhil@3x.png"
-		     thumb-size="sm" @click="changaddr" link></uni-list-item>
-		</uni-list>
+		<text class="linesp"></text>
+		<view v-if="showAdrr==0" class="contentColumn contentSpace">
+			<view class="contentInRowL" style="align-items: start;" @click="changaddr">
+				<image style="width: 60rpx;height: 44rpx;" src="/static/images/dizhil@3x.png" mode=""></image>
+				<text class="textfontB5">{{dizhiID.address}}</text>
+			</view>
+			<view class="contentInRowL">
+				<text class="textfontB5" style="color: darkgray;margin-left: 44rpx;margin-top: 10rpx;">{{dizhiID.name}}  {{dizhiID.phone}}</text>
+			</view>
+		</view>
 		
-		<view v-if="showAdrr==2" class="contentInRowS" style="margin-left:4%;margin-top: 20rpx;width: 92%;margin-bottom: 20rpx;" @click="inputZuohao">
-			<text style="color:fuchsia;font-size: 30rpx;">用餐桌號</text>
-			<text v-if="zuohao.length==0" style="font-weight: bold;color: black;font-size: 34rpx;text-decoration: underline;">用餐桌號</text>
+		<view v-if="showAdrr==2" class="contentInRowR" style="margin-top: 20rpx;width: 92%;margin-bottom: 20rpx;" @click="inputZuohao">
+			<text style="color:black;font-size: 28rpx;margin-right: 16rpx;">用餐桌號</text>
+			<text v-if="zuohao.length==0" style="font-weight: bold;color: black;font-size: 34rpx;text-decoration: underline;">用餐桌號?</text>
 			<text v-if="zuohao.length!=0" style="font-weight: bold;color: black;font-size: 34rpx;text-decoration: underline;">{{zuohao}}</text>
 		</view>
 		
-		<label class="linesp"></label>
-		<label class="linesp"></label>
+		<text class="linesp"></text>
+		<text class="linesp"></text>
+		
+		
 		<uni-list>
 		    <uni-list-item :title="$t('index.goodslist')"></uni-list-item>
 		</uni-list>
 		
 		<view v-for="(items,indexs) in gouwuche">
-			<view class="contentInRowL">
+			<view class="contentInRowL" style="align-items: center;">
 				<netImage style="margin-left: 12rpx;margin-top: 10rpx;" width="60" height="60" bradius="30" :mysrc="items.logo" mymode="scaleToFill"></netImage>
-				<text>{{items.posName}}</text>
+				<text style="margin-left: 10rpx;margin-right: 10rpx;">{{items.posName}}</text>
 			</view>
 			<view v-for="(item,findex) in items.food">
 				<view class="spnodetail">
@@ -76,8 +83,8 @@
 			</view>
 		</view>
 	
-		<label class="linesp"></label>
-		<label class="linesp"></label>
+		<text class="linesp"></text>
+		<text class="linesp"></text>
 		
 		<view class="contentInRowS shifdf" @click="shifodaofu">
 			<view class="contentInRowC">
@@ -86,47 +93,36 @@
 			</view>
 			<image v-if="shifoudf==1" style="width: 50rpx;height: 50rpx;" src="/static/images/dagoul.png" mode="scaleToFill"></image>
 		</view>
-		<label class="linesp"></label>
-		<label class="linesp"></label>
+		<text class="linesp"></text>
+		<text class="linesp"></text>
 		<uni-list>
 		    <uni-list-item :title="$t('order.beizhu')"></uni-list-item>
 		</uni-list>
 		<textarea class="pinglun" :placeholder="$t('order.srddbz')" :value="remarks" @input="sumfontnum"></textarea>
-		<label class="linesp"></label>
-		<label class="linesp"></label>
-		<view v-if="showAdrr==0">
-			<uni-list>
-			    <uni-list-item :title="$t('order.menpaizp')"></uni-list-item>
-			</uni-list>
-			<view class="contentColumnC" style="margin-top: 30rpx;" @click="selectImage">
-				<netImage width="640" height="640" :mysrc="mpImage" mymode="scaleToFill" ></netImage>
-			</view>
-			<view class="linesp" style="margin-top: 20rpx;"></view>
-			<label class="linesp"></label>
-		</view>
+		<text class="linesp"></text>
+		<text class="linesp"></text>
+		
 		
 		<uni-list>
 		    <uni-list-item :title="$t('order.shangpinxj')" :rightText="$formPr(spxj)+$t('locale.huobidw')" />
 			<uni-list-item :title="$t('order.peisongfei')" :rightText="$formPr(psf)+$t('locale.huobidw')"/>
 			<uni-list-item :title="$t('order.youhuijine')" :rightText="$formPr(hyyh)+$t('locale.huobidw')"/>
 		</uni-list>
-		<label class="linesp"></label>
-		<label class="linesp"></label>
+		<text class="linesp"></text>
+		<text class="linesp"></text>
 		<uni-list>
 		    <uni-list-item :title="$t('order.zhifujine')" :rightText="$formPr(zje)+$t('locale.huobidw')"/>
 		</uni-list>
-		<label class="linesp"></label>
-		<label class="linesp"></label>
+		<text class="linesp"></text>
+		<text class="linesp"></text>
 		<view class="delbtct">
 			<view class="delbt" @click="qufukuan">
-				<label >{{actTitle}}</label>
+				<text >{{actTitle}}</text>
 			</view>
 		</view>
 		
-		<label class="linesp"></label>
-		
-		<yhdslCropper ref="yhdslCropper" :quality="1" mode="scale"  @uploadImg="uploadImg" :scale="scale"></yhdslCropper>
-		
+		<text class="linesp"></text>
+				
 		<popViewGG :tips="$t('order.zhifufangshi')" :show="zffsS" :showbotom="false" :maskClosable="true" :isCancel="true" @chooseCancel="chooseCancel">
 			<view class="contentColumnC" style="width: 100%;background-color: whitesmoke;">
 				<view class="zhifbut" style="background-color: deeppink;" @click="huodaofukuan">{{$t('index.huodaofukan')}}</view>
@@ -141,12 +137,9 @@
 </template>
 
 <script>
-	import yhdslCropper from '@/components/yhdsl-cropper/yhdsl-cropper.vue';
+	
 	import api from "@/pages/api/api.js"
 		export default {
-			components:{
-				yhdslCropper
-			},
 		data() {
 			return {
 				userid:0,
@@ -154,15 +147,13 @@
 				rId:'',
 				showAdrr:0,
 				gouwuche:[],
-				Bcolor:'whitesmoke',
+				Bcolor:'lightgreen',
 				Bcolorr:'lightgray',
 				Bcolorrr:'lightgray',
 				Tcolor:'black',
 				Tcolorr:'darkgray',
 				Tcolorrr:'darkgray',
-				peisongimg:'/static/images/peisongh@3x.png',
-				ziquimg:'/static/images/ziqu@3x.png',
-				tangshiimg:'/static/images/tangshih.png',
+				
 				actTitle:this.$t('order.querendd'),
 				actType:0,
 				remarks:'',
@@ -228,17 +219,12 @@
 				return;
 			}
 			this.showAdrr=0;
-			this.peisongimg='/static/images/peisongh@3x.png';
-			this.ziquimg='/static/images/ziqu@3x.png';
-			this.tangshiimg='/static/images/tangshih.png';
-			this.Bcolor='whitesmoke';
+			this.Bcolor='lightgreen';
 			this.Bcolorr='lightgray';
 			this.Bcolorrr='lightgray';
 			this.Tcolor='black';
 			this.Tcolorr='darkgray';
 			this.Tcolorrr='darkgray';
-			
-			
 			this.jisuanjiner();
 		},
 		ziqu(){
@@ -246,11 +232,8 @@
 				return;
 			}
 			this.showAdrr=1;
-			this.peisongimg='/static/images/peisong@3x.png';
-			this.ziquimg='/static/images/ziquh@3x.png';
-			this.tangshiimg='/static/images/tangshih.png';
 			this.Bcolor='lightgray';
-			this.Bcolorr='whitesmoke';
+			this.Bcolorr='lightgreen';
 			this.Bcolorrr='lightgray';
 			this.Tcolor='darkgray';
 			this.Tcolorr='black';
@@ -260,12 +243,9 @@
 		},
 		tangshi(){
 			this.showAdrr=2;
-			this.peisongimg='/static/images/peisong@3x.png';
-			this.ziquimg='/static/images/ziqu@3x.png';
-			this.tangshiimg='/static/images/tangshi.png';
 			this.Bcolor='lightgray';
 			this.Bcolorr='lightgray';
-			this.Bcolorrr='whitesmoke';
+			this.Bcolorrr='lightgreen';
 			this.Tcolor='darkgray';
 			this.Tcolorr='darkgray';
 			this.Tcolorrr='black';
@@ -291,6 +271,7 @@
 			api('getaddressList',{
 			},r=>{
 				this.addrList=r.data.data;
+				console.log(this.addrList);
 				if(this.dizhiID!=''){
 					console.log('3333')
 					// this.kaishichuliyunfei();
@@ -309,9 +290,6 @@
 		},
 		
 		peisongfangshi(){
-			
-			
-			
 		},
 		
 		selectImage(){
@@ -380,7 +358,7 @@
 				var yidongjine=food.number*(parseFloat(food.price)+parseFloat(food.otherPrice));
 				goumaijine = goumaijine+yidongjine;
 			}
-			this.gouwuche[indexs].amount=goumaijine;
+			this.gouwuche[indexs].foodAmount=goumaijine;
 			this.jisuanjiner();
 		},
 		jisuanjiner(){
@@ -393,7 +371,7 @@
 			this.spxj = 0;
 			for(var i=0;i<this.gouwuche.length;i++){
 				var item = this.gouwuche[i];
-				var yidongjine=item.amount;
+				var yidongjine=item.foodAmount;
 				this.spxj = this.spxj+yidongjine;
 				this.gouwuche[i].type=this.showAdrr;//订单类型：0外送，1自取，2堂食
 			}
@@ -707,9 +685,11 @@
 					yunfei=0;
 				}
 				item.freight = yunfei;
+				item.amount = item.foodAmount + yunfei;
 				that.gouwuche[index] = item;
 				if(index==that.gouwuche.length-1){
 					that.yunfeiheji();
+					this.jisuanjiner();
 				}
 			},failc=>{
 				//console.log('getadvertis----',failc)
@@ -723,6 +703,7 @@
 				var item = this.gouwuche[i];
 				this.psf =this.psf+ item.freight;
 			}
+			console.log("this.psf:",this.psf);
 			this.isGetyunfei = true;
 		},
 		
@@ -736,6 +717,13 @@
 page{
 	background-color: #F2F3F7;
 }
+
+.contentSpace{
+	margin-left:4%;
+	margin-top: 20rpx;
+	width: 92%;
+	margin-bottom: 20rpx;
+}
 	.contentV{
 		width:100%;
 		position: relative;
@@ -754,16 +742,6 @@ page{
 		border-radius: 15rpx;
 		border: 2rpx solid lightgray;
 	}
-	.ctinrow{
-		margin-top: 20rpx;
-		width:100%;
-		height: 80rpx;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-	}
-	
 	
 .delbtct{
 	margin-left: 10%;
@@ -779,31 +757,35 @@ page{
 	height: 80rpx;
 	line-height: 80rpx;
 	color: white;
-	background-color: goldenrod;
+	background-color:#40AE36;
 	border-radius: 10rpx;
 }
 
-.topSwichV{
-	height: 70rpx;
-	width: 280rpx;
-	border-radius: 35rpx;
+.ctinrow{
+	margin-top: 20rpx;
+	margin-left: 10%;
+	width:80%;
+	height: 140rpx;
 	display: flex;
-	flex-direction: row;
+	flex-direction:row;
 	align-items: center;
-	justify-content: center;
+	justify-content: space-between;
 }
-.topSwichVL{
-	margin-left: -40rpx;
-	height: 70rpx;
-	width: 200rpx;
-	border-radius: 35rpx;
+	
+.topSwichV{
+	height: 110rpx;
+	width: 110rpx;
+	border-radius: 10rpx;
 	display: flex;
 	flex-direction: row;
 	align-items: center;
 	justify-content: center;
+	padding: 5rpx;
+
 }
+
 .toppz{
-	width: 50rpx;
+	width: 80rpx;
 }
 
 .toppztext{
@@ -817,6 +799,7 @@ page{
 	background-color: white;
 	margin-top: 20rpx;
 	margin-bottom: 20rpx;
+	margin-left: 20rpx;
 }
 .spIcon{
 	margin: 20rpx;

msdYongHu/pages/OrderList/buy/gouwuche.vue

@@ -2,23 +2,23 @@
 	<view class="contentV">
 		<customNav :shownav="false" :title="$t('gouwu.gouwuche')" titledetl=""></customNav>
 		<view v-if="!kongche" class="actBTV viewpading">
-			<view class="">
-				<image class="touyuan" src="/static/images/tuoyuan@3x.png" mode="widthFix"></image>
+			<view >
+				<image class="touyuan" src="/static/meishi/BuyS@3x.png" mode="widthFix"></image>
 				<text style="margin-left: 20rpx;">{{gouwuche.mendname}}</text>
 			</view>
 			<image class="touyuan" src="/static/images/sanchu@3x.png" mode="widthFix" @click="qingkonggouwuc"></image>
 		</view>
 		<view v-if="kongche" class="actBTV" style="height: 80rpx;padding-top:40rpx;background-color: whitesmoke">
 			<view class="">
-				<image class="touyuan" src="/static/images/tuoyuan@3x.png" mode="widthFix"></image>
+				<image class="touyuan" src="/static/meishi/BuyS@3x.png" mode="widthFix"></image>
 				<text style="margin-left: 20rpx;">{{$t('gouwu.gwckongong')}}</text>
 			</view>
 		</view>
 		<view>
 			<view v-for="(items,indexs) in gouwuche">
-				<view class="contentInRowL">
+				<view class="contentInRowL" style="align-items: center;">
 					<netImage style="margin-left: 12rpx;margin-top: 10rpx;" width="60" height="60" bradius="30" :mysrc="items.logo" mymode="scaleToFill"></netImage>
-					<text>{{items.posName}}</text>
+					<text style="padding-left: 10rpx;">{{items.posName}}</text>
 				</view>
 				<view v-for="(item,index) in items.food">
 					<view class="spnodetail">
@@ -73,6 +73,7 @@
 			}
 		},
 		onShow() {
+			this.kongche=false;
 			var gwc = uni.getStorageSync('gouwuche');
 			if(''==gwc||null==gwc||undefined==gwc){
 				this.kongche=true;

msdYongHu/pages/OrderList/buy/hongbaokq.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		<customNav :shownav="true" :title="$t('index.hongbaokq')" titledetl=""></customNav>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

msdYongHu/pages/OrderList/buy/jiesuanYe.vue

@@ -1,1164 +0,0 @@
-<template>
-	<view class="contentV">
-		<customNav :shownav="true" :title="$t('index.xiadanzhifu')" titledetl=""></customNav>
-		
-		<view class="ctinrow">
-			<view class="topSwichV" :style="{backgroundColor:Bcolor}" @click="peisong">
-				<view class="topSwichV">
-					<image class="toppz" :src="peisongimg" mode="widthFix"></image>
-					<text class="toppztext" :style="{color:Tcolor}">{{$t('order.peisong')}}</text>
-				</view>
-			</view>
-			<view class="topSwichVL" :style="{backgroundColor:Bcolorr}" @click="ziqu">
-				<view class="topSwichVL">
-					<image class="toppz" :src="ziquimg" mode="widthFix"></image>
-					<text class="toppztext" :style="{color:Tcolorr}">{{$t('order.ziqu')}}</text>
-				</view>
-			</view>
-			<!-- <view class="topSwichVL" :style="{backgroundColor:Bcolorrr}" @click="tangshi">
-				<view class="topSwichVL">
-					<image class="toppz" :src="tangshiimg" mode="widthFix"></image>
-					<text class="toppztext" :style="{color:Tcolorrr}">{{$t('shouye.tangshi')}}</text>
-				</view>
-			</view> -->
-		</view>
-		<label class="linesp"></label>
-		<uni-list v-if="showAdrr==0">
-		    <uni-list-item :title="dizhiID.address" :note="dizhiID.phone" :rightText="dizhiID.name" thumb="/static/images/dizhil@3x.png"
-		     thumb-size="sm" @click="changaddr" link></uni-list-item>
-		</uni-list>
-		<uni-list>
-			 <uni-list-item :title="delryTime.length>0?$t('order.yuyueshijian'):$t('order.jinkuaisd')" :note="delryTime.length>0?delryTime:('10~20 '+$t('order.Xfenzhongsd'))" :rightText="$t('order.yuyueshijian')" thumb="/static/images/time@3x.png"
-			  thumb-size="sm" @click="yuyueshijian" link></uni-list-item>
-		</uni-list>
-		<label class="linesp"></label>
-		<label class="linesp"></label>
-		<uni-list>
-		    <uni-list-item :title="$t('index.goodslist')"></uni-list-item>
-		</uni-list>
-		
-		<view v-for="(items,indexs) in gouwuche">
-			<view class="contentInRowL">
-				<netImage style="margin-left: 12rpx;margin-top: 10rpx;" width="60" height="60" bradius="30" :mysrc="items.logo" mymode="scaleToFill"></netImage>
-				<text>{{items.posName}}</text>
-			</view>
-			<view v-for="(item,findex) in items.food">
-				<view class="spnodetail">
-					<view class="">
-						<myImage class="spIcon" :mysrc="item.image" mymode="scaleToFill"></myImage>
-					</view>
-					<view style="width: 82%;">
-						<view class="actBTV">
-							<view style="font-size: 30rpx;width: 100%;">
-								<text class="text2row" style="width: 100%;">{{item.name}}</text>
-							</view>
-							<view class="contentInRowL">
-								<image v-if="item.number>0" class="imageRJ" src="/static/meishi/jianh.png" mode="aspectFit" @click="jiajian(findex,-1)"></image>
-								<text v-if="item.number>0" class="textR">{{item.number}}</text>
-								<image class="imageR" src="/static/meishi/jiah.png" mode="aspectFit" @click="jiajian(findex,1)"></image>
-							</view>
-						</view>
-						<view class="actBTV">
-							<view style="font-size: 26rpx;color: blueviolet;">{{$t('shangpin.shoujia')}}: {{$formPr(item.price+item.otherPrice)}}{{$t('locale.huobidw')}}</view>
-							<view class="xiaoji" style="font-size: 28rpx;color: brown;">{{$t('shangpin.xiaoji')}}: {{$formPr((item.price+item.otherPrice)*item.number)}}{{$t('locale.huobidw')}}</view>
-						</view>
-						<view class="viewinrow" >
-							<text class="kouweisku">{{arraytoStr(item.ask)}}</text>
-						</view>
-						<view v-if="item.beizhu" class="">
-							<text style="font-size: 30rpx;color:#00A6FF;">{{item.beizhu}}</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		
-		
-		<!-- <label class="linesp"></label>
-		<label class="linesp"></label>
-		<uni-list style="color: darkgreen;">
-		    <uni-list-item :title="$t('index.hongbaokq')" :note="yhhd" thumb="/static/images/hongbkqh@3x.png"
-		     thumb-size="sm" @click="xuanzcux" link></uni-list-item>
-		</uni-list> -->
-		<label class="linesp"></label>
-		<label class="linesp"></label>
-		
-		<view class="contentInRowS shifdf" @click="shifodaofu">
-			<view class="contentInRowC">
-				<image style="width: 50rpx;height: 50rpx;" src="/static/images/payflact@3x.png" mode="scaleToFill"></image>
-				<text class="shifdftext" :style="shifoudf==0?'color:darkgray;':'color:fuchsia;'">{{$t('index.huodaofukan')}}</text>
-			</view>
-			<image v-if="shifoudf==1" style="width: 50rpx;height: 50rpx;" src="/static/images/dagoul.png" mode="scaleToFill"></image>
-		</view>
-		<label class="linesp"></label>
-		<label class="linesp"></label>
-		<uni-list>
-		    <uni-list-item :title="$t('order.beizhu')"></uni-list-item>
-		</uni-list>
-		<textarea class="pinglun" :placeholder="$t('order.srddbz')" :value="remarks" @input="sumfontnum"></textarea>
-		<label class="linesp"></label>
-		<label class="linesp"></label>
-		<view v-if="showAdrr==0">
-			<uni-list>
-			    <uni-list-item :title="$t('order.menpaizp')"></uni-list-item>
-			</uni-list>
-			<view class="contentColumnC" style="margin-top: 30rpx;" @click="selectImage">
-				<netImage width="640" height="640" :mysrc="mpImage" mymode="scaleToFill" ></netImage>
-			</view>
-			<view class="linesp" style="margin-top: 20rpx;"></view>
-			<label class="linesp"></label>
-		</view>
-		
-		<uni-list>
-		    <uni-list-item :title="$t('order.shangpinxj')" :rightText="$formPr(spxj)+$t('locale.huobidw')" />
-			<uni-list-item :title="$t('order.peisongfei')" :rightText="$formPr(psf)+$t('locale.huobidw')"/>
-			<uni-list-item :title="$t('order.youhuijine')" :rightText="$formPr(hyyh)+$t('locale.huobidw')"/>
-		</uni-list>
-		<label class="linesp"></label>
-		<label class="linesp"></label>
-		<uni-list>
-		    <uni-list-item :title="$t('order.zhifujine')" :rightText="$formPr(zje)+$t('locale.huobidw')"/>
-		</uni-list>
-		<label class="linesp"></label>
-		<label class="linesp"></label>
-		<view class="delbtct">
-			<view class="delbt" @click="qufukuan">
-				<label >{{actTitle}}</label>
-			</view>
-		</view>
-		
-		<label class="linesp"></label>
-		<liu-delivery-time @change="changeTime" @close="deliveryclose" ref="chooseTime" :title="$t('order.yuyueshijian')"></liu-delivery-time>
-		<yhdslCropper ref="yhdslCropper" :quality="1" mode="scale"  @uploadImg="uploadImg" :scale="scale"></yhdslCropper>
-		<popViewGG :tips="$t('index.hongbaokq')" :show="showpop" :acttips="$t('order.queding')" :maskClosable="true" :isCancel="true" @chooseCancel="chooseCancel">
-			<picker-view :indicator-style="indicatorStyle"  @change="bindChange" class="picker-view">
-			    <picker-view-column>
-			        <view class="item" v-for="(item,index) in range" :key="index">{{item}}</view>
-			    </picker-view-column>
-			</picker-view>
-		</popViewGG>
-		<popViewGG :tips="$t('order.zhifufangshi')" :show="zffsS" :showbotom="false" :maskClosable="true" :isCancel="true" @chooseCancel="chooseCancel">
-			<view class="contentColumnC" style="width: 100%;background-color: whitesmoke;">
-				<view class="zhifbut" style="background-color: deeppink;" @click="huodaofukuan">{{$t('index.huodaofukan')}}</view>
-				<!-- <view class="zhifbut" style="background-color:#00A6FF;" @click="getVNPay">VNPAY</view> -->
-			</view>
-		</popViewGG>
-	</view>
-</template>
-
-<script>
-	// import uniList from '@/uni_modules/uni-list/uni-list.vue';
-	// import uniListItem from '@/uni_modules/uni-list-item/uni-list-item.vue';
-	// import uniAd from '@/uni_modules/uni-list-ad/uni-list-ad.vue';
-	// import uniChat from '@/uni_modules/uni-list-chat/uni-list-chat.vue';
-	import yhdslCropper from '@/components/yhdsl-cropper/yhdsl-cropper.vue';
-	import api from "@/pages/api/api.js"
-		export default {
-			components:{
-				yhdslCropper//,uniList,uniListItem
-			},
-		data() {
-			return {
-				mendid:0,
-				userid:0,
-				ddId:'',
-				rId:'',
-				showAdrr:0,
-				gouwuche:[],
-				Bcolor:'whitesmoke',
-				Bcolorr:'lightgray',
-				Bcolorrr:'lightgray',
-				Tcolor:'black',
-				Tcolorr:'darkgray',
-				Tcolorrr:'darkgray',
-				peisongimg:'/static/images/peisongh@3x.png',
-				ziquimg:'/static/images/ziqu@3x.png',
-				tangshiimg:'/static/images/tangshih.png',
-				actTitle:this.$t('order.querendd'),
-				actType:0,
-				remarks:'',
-				spxj:0.00,
-				psf:0.00,
-				freight:0.00,
-				hyyh:0.00,
-				zje:0.00,
-				jvli:0.00,
-				dizhiID:'',
-				addrList:[],
-				peisongdizhiaddress:'',
-				peisongdizhiname:'',
-				peisongdizhiphone:'',
-				zfindex:0,
-				delryTime:'',
-				isGetyunfei:false,
-				mendianMs:'',
-				cid:'',
-				orderDetl:'',
-				shifouzhifu:false,
-				zhifuUrl:'',
-				shifoudf:0,
-				scale:1,
-				baseUrl:this.$baseImagurl,
-				mpImage:'',
-				cxList:'',
-				yhhd:'',
-				range: [],
-				youhuiindex:-1,
-				showpop:false,
-				indicatorStyle: 'height: 50px;',
-				zffsS:false,
-				keyixd:true
-			}
-		},
-		onLoad(option) {
-			
-			var gwc = uni.getStorageSync('gouwuche');
-			if(''==gwc||null==gwc||undefined==gwc){
-				this.gouwuche=[];
-				return
-			}
-			else{
-				this.gouwuche = JSON.parse(gwc);
-			}
-			
-			this.mendid=option.mendid;
-			this.userid=option.userid;
-			this.cuxiaoList();
-			this.cid = uni.getStorageSync("cid");
-			//console.log(this.cid);
-			
-		},
-		onShow() {
-			var temp=uni.getStorageSync("peisongdizhi");
-			if(undefined==temp||null==temp||''==temp ){
-				this.dizhiID='';
-				this.getaddressList();
-			}
-			else{
-				this.dizhiID= temp;
-				this.mpImage=this.dizhiID.annexes;
-			}
-			this.isGetyunfei = false;
-			if(this.mendianMs==''){
-				this.getmendianDetail(this.mendid);
-			}
-			else{
-				if(this.dizhiID==''){
-					this.getaddressList();
-				}
-				else{
-					console.log('4444')
-					this.getyunfei(this.dizhiID.latitude,this.dizhiID.longitude);
-				}
-			}
-			//this.getorderDetl();
-			
-			if(this.shifouzhifu){
-				this.shifouzhifu=false;
-				this.getorderDetl();
-			}
-		},
-		methods: {
-			//促销
-			cuxiaoList(){
-				var price=0;
-				for(var i=0;i<this.foodlist.length;i++){
-					price=price+(this.foodlist[i].price+this.foodlist[i].otherPrice)*this.foodlist[i].number;
-				}
-				api('cuxiaoList',{
-					mdId:this.mendid,
-					price:price
-				},r=>{
-					console.log('-----------',r)
-					if(r.data.code==200){
-						this.cxList=r.data.data;
-						this.range=[];
-						if(this.cxList.length>0){
-							this.yhhd=this.$t('order.qingxzyhkq');
-							for(var i=0;i<this.cxList.length;i++){
-								var obj=this.cxList[i];
-								this.range.push(obj.salesName);
-							}
-						}
-						else{
-							this.yhhd=this.$t('order.zanwuyhkq');
-						}
-					}
-					this.jisuanjiner();
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			
-			jiajian(index,state){
-				if(this.actType>0){
-					return;
-				}
-				var tempList = this.foodlist;
-				if(state>0){
-					var temp = tempList[index];
-					temp.number=temp.number+1;
-					tempList[index]=temp;
-				}
-				else{
-					var temp = tempList[index];
-					if(temp.number>1){
-						temp.number=temp.number-1;
-						tempList[index]=temp;
-					}
-					else{
-						tempList.splice(index,1);
-					}
-				}
-				this.foodlist=tempList;
-				this.cuxiaoList();
-				if(this.foodlist.length==0){
-					uni.showToast({
-					    title: that.$t('comp.qingxzsp'),
-					    icon: 'none',
-					    duration: 2500
-					})
-				}
-			},
-			
-			xuanzcux(){
-				if(this.youhuiindex<0&&this.cxList.length>0){
-					this.youhuiindex=0;
-					this.yhhd=this.cxList[this.youhuiindex].salesName;
-					this.jisuanjiner();
-				}
-				this.showpop=true;
-			},
-			bindChange (e) {
-				var val = e.detail.value[0];
-				this.youhuiindex=val;
-				this.yhhd=this.cxList[this.youhuiindex].salesName;
-				console.log(val)
-				this.jisuanjiner();
-			},
-			chooseCancel(){
-				this.showpop=false;
-				this.zffsS=false;
-				console.log('chooseCancel');
-			},
-			//--------------------------------------------------------
-			
-			arraytoStr(arry){
-				var str='';
-				if(arry.length>0){
-					for(var i=0;i<arry.length;i++){
-						str=str+arry[i]+'; ';
-					}
-					
-				}
-				return str;
-			},
-			jisuanjiner(){
-				this.spxj=0;
-				this.hyyh=0;
-				this.zje=0;
-				for(var i=0;i<this.foodlist.length;i++){
-					this.spxj=this.spxj+(this.foodlist[i].price+this.foodlist[i].otherPrice)*this.foodlist[i].number;
-				}
-				this.hyyh=this.jisuanyouhuijiner(this.spxj);
-				this.hyyh=parseInt(this.hyyh);
-				this.zje=(this.spxj+this.psf)-this.hyyh;
-				this.zje=parseInt(this.zje);
-			},
-			jisuanyouhuijiner(price){
-				var zongyouhui=0;	
-				if(this.cxList.length>0&&this.youhuiindex>=0){
-					var obj=this.cxList[this.youhuiindex];
-					if(obj.salesType=="0"){
-						zongyouhui=zongyouhui+this.psf;
-						if(obj.salesReduction<1){
-							zongyouhui=this.psf*(100-obj.salesReduction*100)/100;
-						}
-						else if(obj.salesReduction>1){
-							if(obj.salesReduction>this.psf){
-								zongyouhui=this.psf;
-							}
-							else{
-								zongyouhui=obj.salesReduction;
-							}
-						}
-					}
-					if(obj.salesType=="1"){
-						zongyouhui=zongyouhui+price*(100-obj.salesReduction*100)/100;
-						console.log(price,obj.salesReduction,price*(1-obj.salesReduction))
-					}
-					if(obj.salesType=="2"){
-						zongyouhui=zongyouhui+obj.salesReduction;
-					}
-				}
-				return zongyouhui;
-			},
-			sumfontnum(e){
-				this.remarks=e.target.value;
-			},
-			shifodaofu(){
-				if(this.actType>1){
-					return;
-				}
-				if(this.shifoudf==0){
-					this.shifoudf=1;
-				}
-				else{
-					this.shifoudf=0;
-				}
-				if(this.actType==1&&this.shifoudf==1){
-					this.actTitle = this.$t('index.huodaofukan');
-					uni.showToast({
-					    title: this.$t('order.xuanzezhif'),
-					    icon: 'none',
-					    duration: 2500
-					})
-				}
-				else if(this.actType==1&&this.shifoudf==0){
-					this.actTitle = this.$t('order.quzhifu');
-				}
-				console.log(this.shifoudf)
-			},
-			changaddr(){
-				uni.navigateTo({
-					url:'/pages/UserCenter/dizhi/dizhilist'
-				})
-			},
-
-			yuyueshijian(){
-				this.$refs.chooseTime.open()
-			},
-			changeTime(e) {
-			    //选择的时间
-				console.log('选择的时间',e.value);
-			    this.delryTime = e.value;
-			},
-			deliveryclose(){
-				this.delryTime='';
-			},
-			peisong(){
-				if(this.actType>0){
-					return;
-				}
-				this.showAdrr=0;
-				this.peisongimg='/static/images/peisongh@3x.png';
-				this.ziquimg='/static/images/ziqu@3x.png';
-				this.tangshiimg='/static/images/tangshih.png';
-				this.Bcolor='whitesmoke';
-				this.Bcolorr='lightgray';
-				this.Bcolorrr='lightgray';
-				this.Tcolor='black';
-				this.Tcolorr='darkgray';
-				this.Tcolorrr='darkgray';
-				this.psf=parseFloat(this.freight);
-				
-				this.jisuanjiner();
-			},
-			ziqu(){
-				if(this.actType>0){
-					return;
-				}
-				this.showAdrr=1;
-				this.peisongimg='/static/images/peisong@3x.png';
-				this.ziquimg='/static/images/ziquh@3x.png';
-				this.tangshiimg='/static/images/tangshih.png';
-				this.Bcolor='lightgray';
-				this.Bcolorr='whitesmoke';
-				this.Bcolorrr='lightgray';
-				this.Tcolor='darkgray';
-				this.Tcolorr='black';
-				this.Tcolorrr='darkgray';
-				this.psf=0;
-				this.jisuanjiner();
-			},
-			tangshi(){
-				this.showAdrr=2;
-				this.peisongimg='/static/images/peisong@3x.png';
-				this.ziquimg='/static/images/ziqu@3x.png';
-				this.tangshiimg='/static/images/tangshi.png';
-				this.Bcolor='lightgray';
-				this.Bcolorr='lightgray';
-				this.Bcolorrr='whitesmoke';
-				this.Tcolor='darkgray';
-				this.Tcolorr='darkgray';
-				this.Tcolorrr='black';
-				this.psf=0;
-				this.jisuanjiner();
-			},
-			qufukuan(){
-				if(this.foodlist.length==0){
-					uni.showToast({
-					    title: that.$t('comp.qingxzsp'),
-					    icon: 'none',
-					    duration: 2500
-					})
-					return;
-				}
-				if(this.keyixd==false){
-					uni.showToast({
-					    title: this.$t('mend.dianjiastatedy'),
-					    icon: 'none',
-					    duration: 2500
-					})
-					return;
-				}
-				if(this.actType==2){//已经支付过了！！
-					// uni.showToast({
-					//     title: '已经支付过了！！',
-					//     icon: 'none',
-					//     duration: 2500
-					// })
-					return;
-				}
-				if(this.actType==1){//未支付，跳转支付
-					this.zffsS=true;
-					return;
-				}
-				var data;
-				if(this.ddId.length>0){
-					console.log('已经生成订单，不能重复提交');
-				}
-				else{
-					this.ddId='99'+ new Date().valueOf();
-				}
-				var yhid='';
-				if(this.cxList.length>0&&this.youhuiindex>=0){
-					var obj=this.cxList[this.youhuiindex];
-					yhid=obj.id;
-				}
-				var cretim=getApp().globalData.sj();
-				// console.log(cretim);
-				// return;
-				if(this.showAdrr==0){
-					if(this.dizhiID==''){
-						uni.showToast({
-						    title: this.$t('order.shdz'),
-						    icon: 'none',
-						    duration: 3500
-						})
-						return;
-					}
-					if(!this.isGetyunfei){
-						uni.showToast({
-						    title: this.$t('order.hqyfsb'),
-						    icon: 'none',
-						    duration: 3500
-						})
-						return;
-					}
-					
-					data={
-					"ddId": this.ddId, 
-					"shId": this.userid, 
-					"mdId": this.mendid, 
-					"activity":yhid, 
-					"shdzId": this.dizhiID.id, 
-					"amount":this.zje, 
-					"discountAmount":this.hyyh,
-					"remarks": this.remarks, 
-					"type": 0, 
-					"delryTime": this.delryTime,//new Date().toISOString(), 
-					"foodlist": this.foodlist,
-					"freight": this.psf,
-					"jvli": this.jvli,
-					"longitude": this.mendianMs.longitude,
-					"latitude":this.mendianMs.latitude,
-					"collectPayment":this.shifoudf,
-					"cretim":cretim
-					}
-				}
-				else{
-					data={
-					"ddId": this.ddId, 
-					"shId": this.userid, 
-					"mdId": this.mendid,
-					"activity":yhid, 
-					"shdzId": '', 
-					"amount":this.zje,
-					"discountAmount":this.hyyh,
-					"remarks": this.remarks, 
-					"type": this.showAdrr, 
-					"delryTime":this.delryTime,// new Date().toISOString(), 
-					"foodlist": this.foodlist,
-					"freight": this.psf,
-					"jvli": this.jvli,
-					"longitude": this.mendianMs.longitude, 
-					"latitude":this.mendianMs.latitude,
-					"collectPayment":this.shifoudf,
-					"cretim":cretim
-					}
-				}
-				this.zhifuUrl='';
-				this.addorder(data);
-				
-			},
-			getaddressList(){
-				api('getaddressList',{
-				},r=>{
-					this.addrList=r.data.data;
-					if(this.dizhiID!=''){
-						console.log('3333')
-						this.getyunfei(this.dizhiID.latitude,this.dizhiID.longitude);
-					}
-					else{
-						if(this.addrList.length>0){
-							console.log('2222')
-							this.dizhiID=this.addrList[0];
-							this.mpImage=this.dizhiID.annexes;
-							this.getyunfei(this.dizhiID.latitude,this.dizhiID.longitude);
-						}
-					}
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			getmendianDetail(id){
-				api('getmendianDetail',{
-					id:id
-				},r=>{
-					this.mendianMs=r.data.data;
-					console.log('getmendianDetail',this.mendianMs);
-					if(this.mendianMs){
-						if(this.mendianMs.state==1){
-							this.keyixd=false;
-						}
-					}
-					if(this.dizhiID==''){
-						this.getaddressList();
-					}
-					else{
-						console.log('111')
-						this.getyunfei(this.dizhiID.latitude,this.dizhiID.longitude);
-					}
-					this.cuxiaoList();
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			getyunfei(lat,lng){
-				var that = this;
-				if(this.mendianMs==''){
-					return;
-				}
-				//this.getjuliForyunfei(lat,lng);//前端请求
-				this.getjuliForyunfeiHT(lat,lng);//后端请求
-			},
-			//通过坐标直线计算运费
-			zhixianyuanfei(lat,lng){
-				var that = this;
-				api('getyunfei',{
-					lat1:lng,
-					lng1:lat,
-					lat2:this.mendianMs.longitude,
-					lng2:this.mendianMs.latitude
-				},r=>{
-					console.log('直线运费');
-					console.log(r);
-					if(r.data.code!=200){
-						return;
-					}
-					that.psf = parseInt(r.data.data.freight);
-					if(that.psf>0){
-					}
-					else{
-						that.psf=0;
-					}
-					that.freight = that.psf;
-					that.jvli = r.data.data.jvli;
-					that.isGetyunfei=true;
-					console.log('直线运费');
-					if(this.showAdrr==0){
-						that.jisuanjiner();
-					}
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			getjuliForyunfei(lat,lng){//前端
-				var data={
-				  "origin":{
-				    "location":{
-				      "latLng":{
-				        "latitude":lat,
-				        "longitude":lng
-				      }
-				    }
-				  },
-				  "destination":{
-				    "location":{
-				      "latLng":{
-				        "latitude":this.mendianMs.latitude,
-				        "longitude":this.mendianMs.longitude
-				      }
-				    }
-				  },
-				  "travelMode": "DRIVE",
-				  "units": "METRIC"//米
-				};
-				console.log(data);
-				api('getdistense',data,r=>{
-					console.log('getadvertis----',r);
-					if(r.statusCode==200){
-						var dist = r.data.routes[0].distanceMeters;
-						console.log(dist/1000);
-						this.getyunfeiWithJuli(dist/1000);
-						console.log('路径运费');
-					}
-					else{
-						this.zhixianyuanfei(lat,lng);
-						console.log('路径计算距离失败！');
-						uni.showToast({
-						    title:'计算距离失败！',
-						    icon: 'none',
-						    duration: 3500
-						})
-					}
-				},failc=>{
-					console.log('getadvertis----',failc)
-				})
-			},
-			getjuliForyunfeiHT(lat,lng){
-				var that = this;
-				var latlng1=''+lat+','+lng;
-				var latlng2=''+this.mendianMs.latitude+','+this.mendianMs.longitude;
-				// var latlng1='10.715641,106.73932';//''+lat+','+lng;
-				// var latlng2='10.754999,106.735601';//''+this.mendianMs.latitude+','+this.mendianMs.longitude;
-				api('getluxianjvli',{
-					latlng1:latlng1,
-					latlng2:latlng2,
-					id:this.userid
-				},r=>{
-					console.log('getjuliForyunfeiHT',r);
-					if(r.data.code==200){
-						if(r.data.data[0]){
-							var legs =r.data.data[0].legs;
-							if(legs[0]){
-								var juli = legs[0].distance.value;
-								// uni.showToast({
-								//     title:'通过轨迹计算运费',
-								//     icon: 'none',
-								//     duration: 3500
-								// })
-								this.getyunfeiWithJuli(juli/1000);
-								return;
-							}
-						}
-					}
-					// uni.showToast({
-					//     title:'直线距离计算运费',
-					//     icon: 'none',
-					//     duration: 3500
-					// })
-					this.zhixianyuanfei(lat,lng);
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			
-			
-			getyunfeiWithJuli(distence){
-				var that = this;
-				api('getZuiyyfei',{
-					quli:JSON.stringify(distence)
-				},r=>{
-					console.log(r);
-					if(r.data.code!=200){
-						return;
-					}
-					that.psf = parseInt(r.data.data.freight);
-					if(that.psf>0){
-					}
-					else{
-						that.psf=0;
-					}
-					that.freight = that.psf;
-					that.jvli = r.data.data.jvli;
-					that.isGetyunfei=true;
-					if(this.showAdrr==0){
-						that.jisuanjiner();
-					}
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			
-			addorder(data){
-				var that = this;
-				uni.showLoading({
-					title:'Loading...',
-					mask:true
-				})
-				console.log('addorder',data);
-				api('addorder',data,
-				r=>{
-					console.log(r);
-					uni.hideLoading();
-					if(r.data.code==200){
-						this.qingkonggouwuche();
-						this.ddId=data.ddId;
-						this.rId=r.data.data.id;
-						this.orderDetl=r.data.data;
-						if(this.shifoudf==0){
-							this.actType = 1;
-							this.actTitle = that.$t('order.quzhifu');
-							uni.showToast({
-							    title: that.$t('order.xuanzezhif'),
-							    icon: 'none',
-							    duration: 2500
-							})
-						}
-						else{
-							this.actType = 1;
-							this.actTitle = that.$t('index.huodaofukan');
-							//到付订单，直接更新支付状态
-							this.huodaofukuan();
-						}
-						
-					}
-					else{
-						uni.showToast({
-						    title: r.data.msg,
-						    icon: 'none',
-						    duration: 2000
-						})
-					}
-				},failc=>{
-					uni.hideLoading();
-					//console.log('getadvertis----',failc)
-				})
-			},
-			
-			getVNPay(){
-				api('setorderuzt',{
-					id:this.rId,
-					"collectPayment":0
-				},res=>{
-					if(res.data.code!=200){
-						return;
-					}
-				},failc=>{
-					return;
-				})
-				this.zffsS=false;
-				var language = uni.getStorageSync('language');
-				var lg;
-				if(language=='yuenan'){
-					lg='vi';
-				}
-				else{
-					lg='en';
-				}
-				uni.showLoading({
-					title:'Loading...',
-					mask:true
-				})
-				api('VNPay',{
-					orderid:this.ddId,
-					amount:parseInt(this.zje),
-					language:lg
-				},r=>{
-					uni.hideLoading();
-					if(r.data.code!=200){
-						uni.showToast({
-						    title: r.data.msg,
-						    icon: 'none',
-						    duration: 3500
-						})
-						return;
-					}
-					this.shifouzhifu=true;
-					this.zhifuUrl='/pages/OrderList/buy/Zhifuyemian?url='+ encodeURIComponent(JSON.stringify(r.data.data))+'&ddid='+this.ddId;
-					uni.navigateTo({
-						url:'/pages/OrderList/buy/Zhifuyemian?url='+ encodeURIComponent(JSON.stringify(r.data.data))+'&ddid='+this.ddId
-					})
-				},failc=>{
-					uni.hideLoading();
-					//console.log('getadvertis----',failc)
-				})
-			},
-			huodaofukuan(){
-				this.shifoudf=1;
-				this.zffsS=false;
-				uni.showLoading({
-					title:'Loading...',
-					mask:true
-				})
-				var that = this;
-				api('setorderuzt',{
-					id:this.rId,
-					"collectPayment":this.shifoudf
-				},res=>{
-					console.log('setorderuzt:',res)
-					uni.hideLoading();
-					if(res.data.code==200){
-						this.actType = 2;
-						this.actTitle = that.$t('order.yizhifu');
-						uni.redirectTo({
-							url:'/pages/OrderList/OrderDetail?ddid='+this.ddId+'&isShangjia=0'
-						})
-					}
-					else{
-						if(res.data.msg){
-							uni.showToast({
-							    title: res.data.msg,
-							    icon: 'none',
-							    duration: 2000
-							})
-						}
-					}
-				},failc=>{
-					uni.hideLoading();
-					//console.log('getadvertis----',failc)
-				})
-			},
-			setorderuzt(){
-				var that = this;
-				api('setorderuzt',{
-					id:this.rId,
-					state:1
-				},res=>{
-					this.actType = 2;
-					this.actTitle = that.$t('order.yizhifu');
-					uni.redirectTo({
-						url:'/pages/OrderList/OrderDetail?ddid='+this.ddId+'&isShangjia=0'
-					})
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			getorderDetl(){
-				var that = this;
-				api('getorderxq',{
-					ddid:this.ddId
-				},r=>{
-					this.orderDetl=r.data.data;
-					if(this.orderDetl.state==1){
-						that.actType = 2;
-						that.actTitle = that.$t('order.yizhifu');
-						uni.redirectTo({
-							url:'/pages/OrderList/OrderDetail?ddid='+this.ddId+'&isShangjia=0'
-						})
-					}
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			qingkonggouwuche(){
-				uni.setStorageSync('gouwuche','');
-				return;
-			},
-			pushMsg(cid,orderId){//消息推送
-				api('pushMsgSJ',{
-					cid:cid,
-					title:'您有新订单了',
-					content:orderId,
-					payload:''
-				},res=>{
-					console.log(res)
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			selectImage(){
-				console.log('selectImage');
-				 this.$refs.yhdslCropper.chooseImage();
-			},
-			uploadImg(e) {
-				console.log('------------uploadImg:',e)
-				this.spImage = e;
-				var that = this;
-				uni.uploadFile({
-					url: this.$upImagurl, //上传图片api
-					filePath: e,
-					name: 'file',
-					header:{
-						//"Authorization": userinfo.token
-					},
-					success: (res) => {
-						let group =  JSON.parse(res.data);
-						that.mpImage=group.data;
-						console.log(group)
-						api('ADDaddress',{
-							id:that.dizhiID.id,
-							annexes:that.mpImage
-						},
-						res=>{
-							if(res.data.code==200){
-								that.dizhiID.annexes=that.mpImage;
-								uni.setStorageSync("peisongdizhi",that.dizhiID);
-							}
-							console.log('getGoodsDetail:',res);
-						},failc=>{
-							//console.log('getadvertis----',failc)
-						})
-						uni.showToast({
-							title:that.$t('mend.shangccg'),
-							icon:"success"
-						})
-						
-					}
-				});
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-page{
-	background-color: #F2F3F7;
-}
-	.contentV{
-		width:100%;
-		position: relative;
-		
-	}
-	.linesp{
-		width:100%;
-		height: 8rpx;
-		background-color: aliceblue;
-	}
-	.pinglun{
-		margin: 16rpx;
-		padding: 10rpx;
-		width:92%;
-		height: 100rpx;
-		border-radius: 15rpx;
-		border: 2rpx solid lightgray;
-	}
-	.ctinrow{
-		margin-top: 20rpx;
-		width:100%;
-		height: 80rpx;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-	}
-	
-	
-.delbtct{
-	margin-left: 10%;
-	margin-top: 20rpx;
-	padding-bottom: 30rpx;
-	width:80%;
-}
-
-.delbt{
-	text-align: center;
-	font-size: 36rpx;
-	width:100%;
-	height: 80rpx;
-	line-height: 80rpx;
-	color: white;
-	background-color: goldenrod;
-	border-radius: 10rpx;
-}
-
-.topSwichV{
-	height: 70rpx;
-	width: 280rpx;
-	border-radius: 35rpx;
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: center;
-}
-.topSwichVL{
-	margin-left: -40rpx;
-	height: 70rpx;
-	width: 200rpx;
-	border-radius: 35rpx;
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: center;
-}
-.toppz{
-	width: 50rpx;
-}
-
-.toppztext{
-	font-size: 30rpx;
-}
-
-.spnodetail{
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	background-color: white;
-	margin-top: 20rpx;
-	margin-bottom: 20rpx;
-}
-.spIcon{
-	margin: 20rpx;
-	width: 90rpx;
-	height: 90rpx;
-}
-.xiaoji{
-	margin-left: auto;
-	margin-right: 30rpx;
-}
-.actBTV{
-	width: 100%;
-	display: flex;
-	flex-direction: row;
-	justify-content:space-between;
-	align-items: center;
-}
-.viewinrow{
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	width: 100%;
-}
-.kouweisku{
-	padding-right: 10rpx;
-	color: chocolate;
-	font-size: 26rpx;
-}
-
-.shifdf{
-	height: 90rpx;
-	width: 90%;
-	margin-left: 5%;
-	align-items: center;
-}
-.shifdftext{
-	margin-left: 30rpx;
-	font-size: 30rpx;
-}
-.picker-view {
-	width: 750rpx;
-	height: 300rpx;
-	margin-top: 10rpx;
-}
-.item {
-	line-height: 100rpx;
-	text-align: center;
-}
-.zhifbut{
-	text-align:center;
-	margin-top: 12rpx;
-	margin-bottom: 12rpx;
-	width: 80%;
-	border-radius: 10rpx;
-	color: white;
-	line-height: 70rpx;
-}
-.imageRJ{
-	width: 40rpx;
-	height: 40rpx;
-	margin-right: 8rpx;
-}
-.imageR{
-	width: 40rpx;
-	height: 40rpx;
-	margin-right: 30rpx;
-}
-.textR{
-	font-size: 26rpx;
-	margin-left: 6rpx;
-	margin-right: 6rpx;
-}
-</style>

msdYongHu/pages/OrderList/buy/myCollection.vue

@@ -0,0 +1,238 @@
+<template>
+	<view class="">
+		<customNav :shownav="true" :title="title" titledetl=""></customNav>
+		<view class="contentColumnC" style="margin-top: 16rpx;">
+			<view class="item_content" v-for="(item,index) in mendianList" @click="mendianxuanze(item.id)">
+				<view class="contentInRowS">
+					<netImage width="130" height="130" bradius="65" :mysrc="item.logo" mymode="scaleToFill"></netImage>
+					<view class="contentColumn" style="width:520rpx ;">
+						<text class="text2row" style="font-size: 30rpx;">{{item.posName}}</text>
+						<view class="contentInRowS">
+							<text v-if="item.pingf" style="font-size: 26rpx;color: brown;">{{item.pingf}}分</text>
+							<text v-if="item.ddsl" style="font-size: 26rpx;color: green;">月售{{item.ddsl}}+</text>
+						</view>
+						<view class="contentInRowS">
+							<text style="font-size: 26rpx;color:dimgrey;">{{item.posPrice}}起送</text>
+							<text v-if="item.juli" style="font-size: 26rpx;">距离{{item.juli}}Km</text>
+						</view>
+						<view class="contentInRowL">
+							<text class="notTextA" style="font-size: 28rpx;">新客优惠</text>
+							<text class="notTextA" style="font-size: 28rpx;">超好吃</text>
+						</view>
+					</view>
+				</view>
+				<view class="">
+					<scroll-view scroll-view  scroll-x="true" >
+						<view class="item_list">
+							<view v-for="(item1, index) in item.foodList">
+								<view class="itemA_content">
+									<netImage width="130" height="130" :mysrc="item1.image" mymode="scaleToFill"></netImage>
+									<view class="contentColumnC title">
+										<text class="text2row" >{{item1.name}}</text>
+										<text>{{item1.price}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+
+	import api from "@/pages/api/api.js"
+	export default {
+		components: {},
+		data() {
+			return {
+				title:'',
+				formData: {
+					status: 'loading', // 加载状态
+				},
+				tipShow: false ,// 是否显示顶部提示框
+				mendianList:{},
+				status:'more',
+				loading:true,
+				listType:'',
+				clickable:true,
+				page:1
+			};
+		},
+		onLoad(option) {
+			console.log('option',option);
+			this.listType=option.listType;
+			if(this.listType==1){
+				this.title = this.$t('user.wodeshouc');
+			}
+			else if(this.listType==2){
+				this.title = this.$t('user.wodezuji')
+			}
+		},
+		onShow(){
+			if(this.listType==1){
+				this.page=1;
+				this.getcollectlist(1);
+			}
+			else if(this.listType==2){
+				this.page=1;
+				this.getuserfootlist(1);
+			}
+			this.status = 'more';
+			this.formData.status = 'loading'
+		},
+		methods: {
+			
+			gotoDetail(e){
+				console.log(e);
+				uni.navigateTo({
+					url:'/pages/shanpinxungou/shangjia/merchantdetail?id='+e
+				})
+			},
+			getuserfootlist(page){
+				this.tipShow = true;
+				var data={
+					page:page,
+					size:10
+				};
+				api('getuserfootlist',data,
+				r=>{
+					console.log('getuserfootlist：',r);
+					if(this.page==1){
+						this.mendianList=r.data.data.records;
+					}
+					else{
+						if(r.data.data.records.length>0){
+							var temp = this.mendianList;
+							for(var i=0;i<r.data.data.records.length;i++){
+								temp.push(r.data.data.records[i]);
+							}
+							this.mendianList=temp;
+						}
+						else{
+							this.status = 'noMore';
+						}
+					}
+					uni.stopPullDownRefresh()
+					this.tipShow = false
+				},failc=>{
+					uni.stopPullDownRefresh()
+					this.tipShow = false
+				})
+			},
+			getcollectlist(page){
+				this.tipShow = true;
+				var data={
+					page:page,
+					size:10
+				};
+				api('getcollectlist',data,
+				r=>{
+					console.log('getcollectlist：',r);
+					if(this.page==1){
+						this.mendianList=r.data.data.records;
+					}
+					else{
+						if(r.data.data.records.length>0){
+							var temp = this.mendianList;
+							for(var i=0;i<r.data.data.records.length;i++){
+								temp.push(r.data.data.records[i]);
+							}
+							this.mendianList=temp;
+						}
+						else{
+							this.status = 'noMore';
+						}
+					}
+					uni.stopPullDownRefresh()
+					this.tipShow = false
+				},failc=>{
+					uni.stopPullDownRefresh()
+					this.tipShow = false
+				})
+			},
+			
+		},
+		/**
+		 * 下拉刷新回调函数
+		 */
+		onPullDownRefresh() {
+			if(this.listType==1){
+				this.page=1;
+				this.getcollectlist(1);
+				this.status = 'more';
+			}
+			else if(this.listType==2){
+				this.page=1;
+				this.getuserfootlist(1);
+				this.status = 'more';
+			}
+			this.formData.status = 'loading'
+		},
+		/**
+		 * 上拉加载回调函数
+		 */
+		onReachBottom() {
+			this.page = this.page+1;
+			if(this.listType==1){
+				this.getcollectlist(this.page);
+				//this.status = 'more';
+			}
+			else if(this.listType==2){
+				this.getuserfootlist(this.page);
+				//this.status = 'more';
+			}
+			
+		},
+	};
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-ui.scss';
+
+	page {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		background-color: #efeff4;
+		min-height: 100%;
+		height: auto;
+	}
+.item_content{
+  	background: white;
+  	width: 660rpx;
+	margin-bottom: 30rpx;
+	padding: 16rpx;
+	border-radius: 16rpx;
+  }
+  .item_list{
+  	padding-left: 40rpx;
+  	display: flex;
+  	flex-direction: row;
+  	justify-content: flex-start;
+  }
+  
+  .itemA_content{
+  	width: 150rpx;
+  	height: 220rpx;
+  	margin: 16rpx 0;
+  	padding: 14rpx;
+  	box-sizing: border-box;
+  	image{
+  		width: 130rpx;
+  		height:130rpx;
+  		background-color:whitesmoke;
+  		display: block;
+  	}
+  	
+  	.title{
+  		width: 100%;
+  		text-align: center;
+  		font-size: 24rpx;
+  		line-height: 30rpx;
+  		padding-top: 4rpx;
+  	}
+  }	
+</style>

msdYongHu/pages/OrderList/buy/wodezhuji.vue

@@ -137,7 +137,7 @@
 			gotoDetail(e){
 				console.log(e);
 				uni.navigateTo({
-					url:'/pages/shanpinxungou/shangjia/shangjiaView?id='+e
+					url:'/pages/shanpinxungou/shangjia/merchantdetail?id='+e
 				})
 			},
 			getuserfootlist(page){

msdYongHu/pages/UserCenter/LoginView.vue

@@ -4,13 +4,13 @@
 		<view class="contentV">
 		<!-- <text class="titlev">{{$t('index.huanying')}}</text> -->
 		<view style="margin-top: 120rpx;">
-			<view class="contentInRowS duoyuyanctv" @click="duoyuyan">
+			<!-- <view class="contentInRowS duoyuyanctv" @click="duoyuyan">
 				<view class="contentInRowL">
 					<image class="duoyuyIcon" src="/static/images/yuyan@3x.png" mode="scaleToFill"></image>
 					<text>Ngôn ngữ/语言</text>
 				</view>
 				<image style="width: 30rpx;" src="/static/images/fanhui@3x.png" mode="widthFix"></image>
-			</view>
+			</view> -->
 		</view>
 		<view class="yzmctV">
 			<view class="xialakuangct" @click="popgjm">
@@ -50,7 +50,7 @@
 			return {
 				pvalue: [0],
 				indicatorStyle: `height: 50px;`,
-				range: ["+886","+86","+84"],
+				range: ["+886","+86"],
 				showpop:false,
 				phone:'',
 				smsCode:'',

msdYongHu/pages/UserCenter/UserCenter.vue

@@ -5,10 +5,9 @@
 			<view class="nodetail"  @click="userIconsel">
 				<view class="viewinrow">
 					<netImage class="userIcon" width="120" height="120" bradius="60" :mysrc="avatar" mymode="scaleToFill"></netImage>
-					<!-- <myImage class="userIcon" :isIcon="true" :mysrc="avatar" mymode="heightFix"></myImage> -->
 					<view class="">
 						<view class="viewinrow">
-							<image class="vipicon" src="/static/images/VIP@3x.png" mode="widthFix"></image>
+							<image class="vipicon" src="/static/images/VIP (1)@3x.png" mode="widthFix"></image>
 							<view class="userName">{{phone}}</view>
 						</view>
 						<text class="usernont">{{nickName}}</text>
@@ -20,60 +19,75 @@
 		<view class="">
 			<view style="width: 100%;height: 50rpx;background-color: #40AE36;"></view>
 			<view class="actBTVn" style="margin-top: -50rpx;">
-				<view class="actbt"  @click="gouwuche">
+				
+				<view class="actbt" @click="wodeshoucang">
 					<view class="ddbticon">
-						<image class="bticonb" src="/static/images/gouwuch@3x.png" mode="widthFix"></image>
+						<image class="bticonb" src="/static/meishi/shouchang@3x.png" mode="widthFix"></image>
 					</view>
 					<view class="acttextw textfontB5">
-						<text >{{$t('gouwu.gouwuche')}}</text>
+						<text >{{$t('index.shouchang')}}</text>
 					</view>
 				</view>
-				<view class="actbt" @click="wodeshoucang">
+				<view class="actbt"  @click="wodezhuji">
 					<view class="ddbticon">
-						<image class="bticonb" src="/static/images/shoucangh@3x.png" mode="widthFix"></image>
+						<image class="bticonb" src="/static/meishi/zhuji@3x.png" mode="widthFix"></image>
 					</view>
 					<view class="acttextw textfontB5">
-						<text >{{$t('index.shouchang')}}</text>
+						<text >{{$t('index.zhuji')}}</text>
 					</view>
 				</view>
-				<view class="actbt"  @click="wodezhuji">
+				<view class="actbt" @click="listClick(1)">
 					<view class="ddbticon">
-						<image class="bticonb" src="/static/images/zhujih@3x.png" mode="widthFix"></image>
+						<image class="bticonb" src="/static/meishi/shouhdz@3x.png" mode="widthFix"></image>
 					</view>
 					<view class="acttextw textfontB5">
-						<text >{{$t('index.zhuji')}}</text>
+						<text >{{$t('index.shouhuodz')}}</text>
 					</view>
 				</view>
-				<!-- <view class="actbt"  @click="hongbaokq">
+				<view class="actbt"  @click="lianxikf">
 					<view class="ddbticon">
-						<image class="bticonb" src="/static/images/hongbkqh@3x.png" mode="widthFix"></image>
+						<image class="bticonb" src="/static/meishi/zaixiankf@3x.png" mode="widthFix"></image>
 					</view>
 					<view class="acttextw textfontB5">
-						<text >{{$t('index.hongbaokq')}}</text>
+						<text >{{$t('order.lianxikef')}}</text>
 					</view>
-				</view> -->
+				</view>
+				
 			</view>
-		</view>
-		<scroll-view :style="'height:'+scrollHeight+'rpx;'" scroll-y="true">
-			<uni-list class="listcontent">
-			    <uni-list-item :show-extra-icon="true" showArrow thumb="/static/images/dizhi@3x.png" thumb-size="sm" :title="$t('index.shouhuodz')" @click="listClick(1)" link/>
-				<uni-list-item :show-extra-icon="true" showArrow thumb="/static/images/yuyan@3x.png" thumb-size="sm" title="Ngôn ngữ/语言" @click="listClick(4)" link/>
-				<uni-list-item :show-extra-icon="true" showArrow thumb="/static/images/zhoubianfw.png" thumb-size="sm" :title="$t('index.zhoubianfw')" @click="listClick(5)" link/>
-				<!-- <uni-list-item :show-extra-icon="true" showArrow thumb="/static/images/gengduozx.png" thumb-size="sm" :title="$t('user.baomizc')" @click="openWebView(1)" link/> -->
-				<!-- <uni-list-item :show-extra-icon="true" showArrow thumb="/static/images/gengduozx.png" thumb-size="sm" :title="$t('user.fuwutiaok')" @click="openWebView(2)" link/>
-				<uni-list-item :show-extra-icon="true" showArrow thumb="/static/images/gengduozx.png" thumb-size="sm" :title="$t('user.caozuogz')" @click="openWebView(3)" link/>
-				<uni-list-item :show-extra-icon="true" showArrow thumb="/static/images/gengduozx.png" thumb-size="sm" :title="$t('user.zengyihts')" @click="openWebView(4)" link/> -->
-				<uni-list-item :show-extra-icon="true" showArrow thumb="/static/images/tuichu.png" thumb-size="sm" :title="$t('user.tuichudl')" @click="tuichudengl" link/>
-				<uni-list-item :show-extra-icon="true" showArrow thumb="/static/images/sanchuzh.png" thumb-size="sm" :title="$t('user.zhuxiaozhh')" @click="zhuxiaozhangh" link/>
-				<uni-list-item :show-extra-icon="true" showArrow thumb="/static/images/yinszct.png" thumb-size="sm" :title="$t('user.yinsizhc')" @click="yinsizhc" link/>
-				<!-- <uni-list-item :show-extra-icon="true" showArrow thumb="/static/images/guanyu.png" thumb-size="sm" :title="$t('user.guanyuwm')" @click="openWebView(5)" link/> -->
-				<!-- <uni-list-item :show-extra-icon="true" showArrow thumb="/static/images/shezhi@3x.png" thumb-size="sm" :title="$t('index.setting')" @click="listClick(7)" link/> -->
-			</uni-list>
-			<view class="contentInRowC" style="margin-top: 80rpx;">
-				<text class="dangqbb">{{$t('user.dangqianbb')}}: v{{appversionN}}</text>
+			<view class="actBTVn" style="padding-top: 18rpx;">
+				<view class="actbt" @click="yinsizhc">
+					<view class="ddbticon">
+						<image class="bticonb" src="/static/meishi/yinsizhc@3x.png" mode="widthFix"></image>
+					</view>
+					<view class="acttextw textfontB5">
+						<text >{{$t('user.yinsizhc')}}</text>
+					</view>
+				</view>
+				<view class="actbt">
+		
+				</view>
+				<view class="actbt" >
+					
+				</view>
+				<view class="actbt" >
+					
+				</view>
+				<view class="actbt"  >
+					
+				</view>
 			</view>
-			<view style="height: 80rpx;"></view>
-		</scroll-view>
+		</view>
+		<view class="contentInRowC" style="margin-top: 80rpx;">
+			<text class="dangqbb" @click="tuichudengl">{{$t('user.tuichudl')}}</text>
+		</view>
+		
+		<view class="contentInRowC" style="margin-top: 40rpx;">
+			<text class="sanchuzh" @click="zhuxiaozhangh">{{$t('user.zhuxiaozhh')}}</text>
+		</view>
+		
+		<view class="contentInRowC" style="margin-top: 50rpx;">
+			<text style="font-size: 26rpx;">{{$t('user.dangqianbb')}}: v{{appversionN}}</text>
+		</view>
 		
 		
 		<popViewGG :tips="$t('index.zhoubianfw')" :show="showpop" :acttips="$t('order.queding')" :maskClosable="true" :isCancel="true" @chooseCancel="chooseCancel">
@@ -88,17 +102,9 @@
 </template>
 
 <script>
-	import uniList from '@/uni_modules/uni-list/uni-list.vue';
-	import uniListItem from '@/uni_modules/uni-list-item/uni-list-item.vue';
-	import uniAd from '@/uni_modules/uni-list-ad/uni-list-ad.vue';
-	import uniChat from '@/uni_modules/uni-list-chat/uni-list-chat.vue';
 
  import api from "@/pages/api/api.js"
-	
 		export default {
-			components:{
-				uniList,uniListItem,uniAd,uniChat
-			},
 		data() {
 			return {
 				range: ["3Km","5Km","10Km","15Km","20Km"],
@@ -156,7 +162,7 @@
 			wodeshoucang(){
 				if(this.login){
 					uni.navigateTo({
-						url:'/pages/OrderList/buy/wodezhuji?listType=1'
+						url:'/pages/OrderList/buy/myCollection?listType=1'
 					})
 				}else{
 					uni.navigateTo({
@@ -167,7 +173,7 @@
 			wodezhuji(){
 				if(this.login){
 					uni.navigateTo({
-						url:'/pages/OrderList/buy/wodezhuji?listType=2'
+						url:'/pages/OrderList/buy/myCollection?listType=2'
 					})
 				}else{
 					uni.navigateTo({
@@ -175,11 +181,7 @@
 					})
 				}
 			},
-			hongbaokq(){
-				uni.navigateTo({
-					url:'/pages/OrderList/buy/hongbaokq'
-				})
-			},
+			
 			listClick(e){
 				
 				switch(e){
@@ -195,9 +197,7 @@
 					}
 					break;
 					case 2:
-					uni.navigateTo({
-						url:'/pages/UserCenter/huiyuan/huiyuan'
-					})
+					
 					break;
 					case 3:
 					uni.navigateTo({
@@ -237,7 +237,7 @@
 				if(this.login){
 					//用户信息编辑页
 					uni.navigateTo({
-						url:'/pages/UserCenter/userMsgMenager'
+						url:'/pages/UserCenter/userinfoSet'
 					})
 				}else{
 					uni.navigateTo({
@@ -303,6 +303,11 @@
 				    }
 				})
 			},
+			lianxikf(){
+				uni.navigateTo({
+					url:'/pages/kehufuwu/kefuMsgList?ddId='
+				})
+			},
 			zhuxiaozhangh(){
 				var that = this;
 				uni.showModal({
@@ -537,8 +542,25 @@
 		text-align: center;
 	}
 	.dangqbb{
-		padding-top: 10rpx;
-		font-size: 28rpx;
+		width:80%;
+		text-align: center;
+		font-size: 36rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		color: white;
+		background-color:#40AE36;
+		border-radius: 10rpx;
+	}
+	
+	.sanchuzh{
+		width:80%;
+		text-align: center;
+		font-size: 36rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		color: white;
+		background-color:crimson;
+		border-radius: 10rpx;
 	}
 
 </style>

msdYongHu/pages/UserCenter/dizhi/dizhilist.vue

@@ -4,12 +4,12 @@
 		<view class="contentColumn" style="margin-bottom: 120rpx;">
 			<view class="" v-for="item in addrList">
 				<view class="itemView">
-					<uni-icons  custom-prefix="custom-icon" color="slateblue" type="compose" size="28" @click="editdizhi(item.id)"></uni-icons>
 					<view class="textView" @click="addrSelect(item)">
+						<text class="nameph">{{item.name}}   {{item.phone}}</text>
 						<text class="addrV">{{item.address}}</text>
 						<text class="addrcity">{{item.area}}</text>
-						<text class="nameph">{{item.name}}: {{item.phone}}</text>
 					</view>
+					<uni-icons  custom-prefix="custom-icon" color="slateblue" type="compose" size="28" @click="editdizhi(item.id)"></uni-icons>
 				</view>
 			</view>
 		</view>
@@ -49,6 +49,7 @@
 			getaddressList(){
 				api('getaddressList',{
 				},r=>{
+					console.log(r);
 					this.addrList=r.data.data;
 				},failc=>{
 					//console.log('getadvertis----',failc)
@@ -102,8 +103,9 @@
 }
 
 .nameph{
-	font-size: 28rpx;
+	font-size: 30rpx;
 	color: darkslategray;
+	font-weight: bold;
 }
 	
 .addbtV{

msdYongHu/pages/UserCenter/dizhi/newdizhi.vue

@@ -134,9 +134,6 @@
 				this.phone = event.target.value;
 			},
 			selectDizhi(){
-				// uni.navigateTo({
-				// 	url:'/pages/UserCenter/map/mapN?state=2'
-				// })
 				uni.navigateTo({
 					url:'/pages/UserCenter/map/Chazhaodizhi'
 				})

msdYongHu/pages/UserCenter/huiyuan/huiyuan.vue

@@ -1,281 +0,0 @@
-<template>
-	<view>
-		<customNav :shownav="true" :title="$t('index.huiyuanzhx')" titledetl=""></customNav>
-		<view class="">
-			<image class="imagV" src="/static/defimages/huiyuanxc.png" mode="widthFix"></image>
-		</view>
-		<view class="actBTct">
-			<view class="actBTV" >
-				<view class="blockView" v-for="(item,index) in vipList" @click="xuangou(item.id)">
-					<view class="notecontent">
-						<text class="titleact">{{item.name}}</text>
-						<text class="noteact">${{item.price}}</text>
-					</view>
-					
-				</view>
-			</view>
-		</view>
-		<view class="huiyuanqyct">
-			<text class="notev">{{$t('huiy.goumjswty')}}</text>
-			<image class="huiyuanqy" src="/static/defimages/huiyuanqy.png" mode="heightFix"></image>
-		</view>
-		<view class="keywordLct">
-			<view class="hyqyct">
-				<text class="titlefl">2张平台券</text>
-				<view class="qyblockView">
-					<text class="yhqje">$5</text>
-					<view class="shuline"></view>
-					<view class="notecontent">
-						<text class="titlev">VIP会员权益 $5优惠券</text>
-						<text class="notev">满$20可用</text>
-					</view>
-					<text class="zhangshu">X 2 张</text>
-				</view>
-			</view>
-		</view>
-		<view class="keywordLct">
-			<view class="hyqyct">
-				<text class="titlefl">10张运费券</text>
-				<view class="qyblockView">
-					<text class="yhqje">$10</text>
-					<view class="shuline"></view>
-					<view class="notecontent">
-						<text class="titlev">VIP会员权益 $10运费抵扣券</text>
-						<text class="notev">满$50可用</text>
-					</view>
-					<text class="zhangshu">X 5 张</text>
-				</view>
-				<view class="qyblockView">
-					<text class="yhqje">$5</text>
-					<view class="shuline"></view>
-					<view class="notecontent">
-						<text class="titlev">VIP会员权益 $5运费抵扣券</text>
-						<text class="notev">满$30可用</text>
-					</view>
-					<text class="zhangshu">X 5 张</text>
-				</view>
-			</view>
-		</view>
-		<view class="keywordLct">
-			<view class="hyqyct">
-				<text class="titlefl">5张商家联盟券</text>
-				<view class="qyblockView">
-					<text class="yhqje">$20</text>
-					<view class="shuline"></view>
-					<view class="notecontent">
-						<text class="titlev">VIP会员权益 $20优惠券</text>
-						<text class="notev">满$100可用</text>
-					</view>
-					<text class="zhangshu">X 5 张</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-
-	import api from "@/pages/api/api.js"
-	export default {
-		data() {
-			return {
-				vipList:[],
-				userInfo:[]
-			}
-		},
-		onShow() {
-			this.getviplist();
-			// var temp = uni.getStorageSync('userInfo');
-			// this.userInfo = JSON.parse(temp);
-		},
-		methods: {
-			xuangou(id){
-				
-				var token = uni.getStorageSync("token");
-				console.log('2222',token)
-				if(token == '' || token == undefined || token == null){
-					uni.navigateTo({
-						url:'/pages/UserCenter/LoginView'
-					})
-					return;
-				}
-				
-				uni.showModal({
-				    title: '提示',
-				    content: '选择支付方式并支付，待完善？',
-				    success: function (res) {
-				    }
-				})
-				return;
-				this.adduservip(id);
-			},
-			getviplist(){
-				api('getviplist',{
-				},r=>{
-					this.vipList = r.data.data;
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			async adduservip(id){
-				api('adduservip',{
-					id:id
-				},r=>{
-					console.log(r)
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-		},
-	}
-</script>
-
-<style lang="scss">
-	
-.imagV{
-	width: 100%;
-}
-
-.imageIcon{
-	width: 60rpx;
-}
-.actBTct{
-	display: flex;
-	flex-direction: row;
-	justify-content:center;
-	align-items: center;
-	background-color: aliceblue;
-}
-.actBTV{
-	width: 92%;
-	display: flex;
-	flex-direction: row;
-	justify-content:space-between;
-	align-items: center;	
-}
-
-.blockView{
-	width: 30%;
-	height: 140rpx;
-	margin-top: 10rpx;
-	align-items:center;
-	justify-content:center;
-	background-color: white;
-	border: 2rpx dotted sandybrown;
-}
-.notecontent{
-	margin-left: 12rpx;
-	display: flex;
-	flex-direction:column;
-	justify-content: flex-start;
-	
-}
-.titleact{
-	font-size: 36rpx;
-	text-align: left;
-	color: saddlebrown;
-}
-.noteact{
-	font-size: 40rpx;
-	font-weight: bold;
-	color: crimson;
-	text-align: right;
-	margin-top: 26rpx;
-	margin-right: 10rpx;
-}
-
-.keywordLct{
-	display: flex;
-	flex-direction: colum;
-	justify-content:flex-start;
-	background-color: aliceblue;
-}
-
-.titlefl{
-	font-size: 30rpx;
-	padding-left: 16rpx;
-	text-align: left;
-}
-
-.titlev{
-	font-size: 30rpx;
-	text-align: left;
-}
-.notev{
-	font-size: 28rpx;
-	color: darkgray;
-	text-align: left;
-}
-
-.xuangou{
-	font-size: 28rpx;
-	margin-left: auto;
-	margin-right: 20rpx;
-	padding: 8rpx;
-	border: 2rpx solid brown;
-	border-radius: 8rpx;
-}
-
-.huiyuanqyct{
-	display: flex;
-	flex-direction: column;
-	justify-content:center;
-	align-items: center;
-	background-color: aliceblue;
-}
-
-.huiyuanqy{
-	width: 100%;
-	margin-top: 20rpx;
-	height: 40rpx;
-}
-
-.hyqyct{
-	width: 86%;
-	margin: 16rpx;
-	padding-bottom: 18rpx;
-	display: flex;
-	flex-direction: column;
-	justify-content:flex-start;
-	border-bottom-width: 2rpx;
-	border-bottom-color: lightgray;
-	border-bottom-style: solid;
-	
-}
-
-.qyblockView{
-	width: 100%;
-	margin-top: 6rpx;
-	margin-left: 16rpx;
-	margin-right: 16rpx;
-	padding: 20rpx;
-	display: flex;
-	flex-direction:row;
-	justify-content: flex-start;
-	align-items:center;
-	background-color: wheat;
-}
-
-.zhangshu{
-	font-size: 28rpx;
-	margin-left: auto;
-	margin-right: 20rpx;
-	padding: 8rpx;
-}
-
-.yhqje{
-	width: 100rpx;
-	font-size: 46rpx;
-	text-align: right;
-	padding-left: 10rpx;
-}
-
-.shuline{
-	margin-left: 10rpx;
-	margin-right: 6rpx;
-	background-color: darkgray;
-	width: 4rpx;
-	height: 80rpx;
-}
-
-</style>

msdYongHu/pages/UserCenter/map/Chazhaodizhi.nvue

@@ -32,7 +32,7 @@
 			this.statusBarHeight = uni.getSystemInfoSync().screenHeight;
 			this.lng = 113.64360881345777;
 			this.lat = 34.738282020827825;
-			this.webUrl = '/hybrid/html/maps/mapindex.html?sstate=1&&lat=' + this.lat + '&lng=' + this.lng+'&nlng=0&nlat=0';
+			this.webUrl = '/hybrid/html/maps/mapindex.html?sstate=3&&lat=' + this.lat + '&lng=' + this.lng+'&nlng=0&nlat=0';
 			
 			var language = uni.getStorageSync('language');
 			if(language=='yuenan'){
@@ -74,7 +74,7 @@
 						console.log('当前位置的经度11：' + JSON.stringify(res));
 						self.lat = res.latitude;
 						self.lng = res.longitude;
-						self.webUrl = '/hybrid/html/maps/mapindex.html?sstate=1&&lat=' + self.lat +'&lng=' +self.lng+'&nlng=0&nlat=0&lg='+self.lg;
+						self.webUrl = '/hybrid/html/maps/mapindex.html?sstate=3&&lat=' + self.lat +'&lng=' +self.lng+'&nlng=0&nlat=0&lg='+self.lg;
 					}
 				});
 				return

msdYongHu/pages/UserCenter/map/mapN.nvue

@@ -1,673 +0,0 @@
-<template>
-	<view>
-		<customNav :shownav="state" title="map" titledetl=""></customNav>
-		<view class="mapcontentV" :style="'height:'+mapHeight+'rpx;'">
-			<view class="">
-				 <map id="map" class="mapbody" scale="18" show-location="true" :style="'height:'+mapHeight+'rpx;'" :latitude="latitude" :longitude="longitude" :markers="covers" :controls="controls" @markertap="markertap" @regionchange="regionChange" @controltap="controlstp" @anchorpointtap="anchorpointtap">
-				</map>
-			</view>
-		</view>
-		<view class="contensb">
-			<view style="height: 8rpx;background-color:lavender;width: 100vw;"></view>
-			<view v-if="pois.length==0" class="contentColumnC" style="margin-top: 50rpx;">
-				<text class="itemTextTop">{{i18n('index.fujinredwz')}}</text>
-			</view>
-			<!-- <text>{{latitude}},{{longitude}}</text> -->
-			<scroll-view class="scrollVct" :scroll-top="scrollTop" scroll-y="true" :style="'height:'+listHight+'rpx;'">
-				<view class="contentColumn" v-if="type==0">
-					<view class="itemContent contentInRowS" v-for="(item,index) in pois" @click="querendizhi(index)">
-						<uni-icons v-if="chakanzb"  custom-prefix="custom-icon" color="#00A6FF" type="location-filled" size="28"  @click="listMarkertap(item)"></uni-icons>
-						<view class="contentColumn" style="width: 580upx;align-items: center;">
-							<text class="addrName">{{item.name}}</text>
-							<text class="addrNamedetl">{{item.addr}}</text>
-						</view>
-						<uni-icons custom-prefix="custom-icon" color="slateblue" type="compose" size="28"  @click="addrselect(item)"></uni-icons>
-					</view>
-				</view>
-				<view class="contentColumn" v-if="type==1">
-					<view class="itemContent contentInRowL" v-for="(item,index) in pois" @click="querendizhi(index)">
-						<uni-icons v-if="chakanzb"  custom-prefix="custom-icon" color="#00A6FF" type="location-filled" size="28"  @click="listMarkertap(item)"></uni-icons>
-						<view class="contentColumn" style="width: 580upx;align-items: center;">
-							<text class="addrName">{{item.name}}</text>
-							<text class="addrNamedetl">{{item.vicinity}}</text>
-						</view>
-						<uni-icons custom-prefix="custom-icon" color="slateblue" type="compose" size="28"  @click="addrselect(item)"></uni-icons>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-		<uni-popup ref="alertDialog" type="dialog">
-			<uni-popup-dialog type="NOMLE" :cancelText="i18n('order.quxiao')" :confirmText="i18n('comp.queren')" :title="noteMsg.title" :content="noteMsg.msg" @confirm="dialogConfirm"
-				@close="dialogClose"></uni-popup-dialog>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import api from "@/pages/api/api.js"
-	export default {
-		data() {
-			return {
-				controls:[],
-				covers:[],
-				latitude: 22.84585,
-				longitude:108.324762,
-				mapCenter:{
-					lat:22.881143,
-					lon: 108.41943
-				},
-				pois:[],
-				poi:[],
-				markAddr:'',
-				scrollTop:0,
-				mapHeight:0,
-				listHight:0,
-				left:0,
-				top:1,
-				mapContext:Object,
-				state:true,
-				isAndroid:true,
-				chakanzb:true,
-				type:1,
-				noteMsg:{
-					title:'',
-					msg:'',
-					markAddr:'',
-					lat:0,
-					lon:0
-				},
-				previous:0,
-				timer:''
-			}
-		},
-		onReady() {
-			this.mapContext = uni.createMapContext("map",this); 
-			console.log('---------1')
-			if(!this.isAndroid){
-				this.setCenter();
-			}
-			this.gotoLocat();
-		},
-		onBackPress(options) {
-		   //console.log('options', options);
-		   if (options.from == 'backbutton') {
-		       return !this.state;
-		   } else if (options.from == 'navigateBack') {
-		       return false;
-		   }
-		},
-		onLoad(option) {
-			let systemInfo = uni.getSystemInfoSync();
-			this.isAndroid = systemInfo.platform.toLowerCase() === 'android';
-			var temp = option.state;
-			if(temp==1){
-				this.state=false;
-			}
-			if(temp==2){
-				this.chakanzb=false;
-			}
-			var info = uni.getSystemInfoSync();
-			this.mapHeight=600;
-			this.listHight=info.windowHeight*2-740-info.statusBarHeight*2;
-			this.left = 750;
-			this.top = 250;
-		},
-		methods: {
-			i18n(str){
-				return getApp().globalData.$t(str);
-			},
-			gotoLocat(){
-				var that = this;
-				uni.getLocation({
-					type: "wgs84", //默认为 wgs84 返回 gps 坐标//谷歌地图使用 wgs84 坐标，其他地图使用 gcj02 坐标
-					geocode: "true",
-					isHighAccuracy: "true",
-					accuracy: "best", // 精度值为20m
-					success: function (res) {
-						console.log(res);
-						that.markAddr='Location';
-						if(res.type=='gcj02'){
-							//that.movetoCenter(res.latitude,res.longitude,false);
-							that.gcj02towgsM(res.latitude,res.longitude);//gcj02定位查询
-						}
-						else if(res.type=='wgs84'){
-							var latlon= res.latitude+','+res.longitude;
-							//that.getAreaCode(latlon);
-							//that.setLocat(res.latitude,res.longitude,1,5);//wgs84转为gcj02显示在地图上
-							that.movetoCenter(res.latitude,res.longitude,false);
-						}
-					  //that.setLocat(res.latitude,res.longitude,1,5);//wgs84转为gcj02显示在百度地图上
-					  //that.gcj02towgs(res.latitude,res.longitude);//gcj02定位查询
-					},
-					fail(err) {
-						console.log('--------getLocation',err)
-					}
-				});
-			},
-			movetoCenter(latitude,longitude,sLb){
-				console.log(longitude)
-				if(this.latitude==latitude){
-					this.latitude=latitude+0.0000000001;
-				}
-				else{
-					this.latitude=latitude;
-				}
-				this.longitude=longitude;
-				this.mapCenter.lat = this.latitude;
-				this.mapCenter.lon = this.longitude;
-				this.mapContext.moveToLocation();
-			},
-			setCenterMark(){
-				this.covers=[{
-					id:1,//控件id
-					iconPath:'/static/images/Rdizhil110@3x.png',//显示的图标 
-					latitude:this.mapCenter.lat,
-					longitude:this.mapCenter.lon,
-				}];
-			},
-			getAreaCode(latlng){
-				var userId = uni.getStorageSync('userId');
-				var that = this;
-				uni.showLoading({
-					title:'Loading...',
-					mask:true
-				})
-				api('getLocationAddr',{
-					latlng:latlng,
-					type:this.type,
-					id:userId
-				},r=>{
-					uni.hideLoading();
-					//console.log('getAreaCode11',r);
-					if(r.data.code!=200){
-						return;
-					}
-					if(this.type==1){
-						if(r.data.data.results.length==0){
-							uni.showToast({
-							    title:r.data.data.error_message,
-							    icon: 'none',
-							    duration: 2000
-							})
-							return;
-						}
-					}
-					that.dowithAddr(r.data.data,latlng);
-					that.scrollTop=0;
-				},failc=>{
-					uni.hideLoading();
-					//console.log('getadvertis----',failc)
-				})
-			},
-			dowithAddr(r,latlng){
-				//console.log(r);
-				if(this.type==0){
-					if(r.result.pois.length>0){
-						this.pois=r.result.pois;
-						this.markAddr=r.result.formatted_address;
-					}
-				}
-				else if(this.type==1){
-					if(r.results.length>0){
-						r.results[0].name=r.address.name;
-						r.results[0].vicinity=r.address.address;
-						var s = latlng.split(',');
-						r.results[0].geometry.location.lng=s[1];
-						r.results[0].geometry.location.lat=s[0];
-						this.pois=r.results;
-						this.markAddr=r.address.address;
-					}
-				}
-			},
-			regionChange(val){
-				console.log('regionChange',val)
-				var now = new Date().valueOf();
-				
-				if(this.isAndroid){
-					if(val.type!='end'){
-						return;
-					}
-				}
-				else{
-					if(val.detail.type!='end'){
-						console.log('ios begin')
-						return;
-					}
-					else{
-						console.log('ios end')
-					}
-				}
-				var that = this;
-				if (now - that.previous < 300) {
-				    if (that.timer) clearTimeout(that.timer)
-				    that.timer = setTimeout(() => {
-				          that.previous = now
-				            that.CenterLocation();
-				    }, 300)
-				}
-				else{
-					that.previous=now;
-					if (that.timer) clearTimeout(that.timer)
-					that.timer = setTimeout(() => {
-					        that.CenterLocation();
-					}, 300)
-				}
-			},
-			CenterLocation(){
-				var that = this;
-				this.mapContext.getCenterLocation({
-					success: res => {//经纬度格式是gcj02
-						console.log('getCenterLocation',res)
-						this.mapCenter.lat = res.latitude;
-						this.mapCenter.lon = res.longitude;
-						//that.bdtogps(tap,2)
-						//this.gcj02towgs(res.latitude,res.longitude);
-						var latlon= res.latitude+','+res.longitude;
-						console.log('----1',latlon);
-						this.setCenterMark();
-						this.getAreaCode(latlon);
-						this.tempmark=false;
-					},
-					fail: res => {
-						console.log(res);
-					}
-				})
-			},
-			controlstp(tap){
-				console.log('controlstp------',tap)
-				//this.mapContext.moveToLocation(); 
-				if(tap.detail.controlId==2){
-					this.gotoLocat();
-				}
-				if(tap.detail.controlId==1){
-					console.log(tap);
-					var addr={
-						address:this.markAddr,
-						name:'',
-						longitude:this.mapCenter.lon, 
-						latitude: this.mapCenter.lat, 
-					}
-					var that = this;
-					uni.showModal({
-					    title: that.i18n('api.message'),
-					    content:that.i18n('index.querenxzwz'),
-						cancelText: that.i18n('order.quxiao'), // 取消按钮的文字  
-						confirmText: that.i18n('comp.queren'), // 确认按钮的文字  
-					    success: function (res) {
-							if (res.confirm) { //这里是点击了确定以后
-								uni.setStorageSync('tempLocation',addr);
-								uni.setStorageSync('userAddrLocation',addr);
-								uni.navigateBack();
-							} else { //这里是点击了取消以后
-							  
-							}
-					    }
-					})
-				}
-			},
-			markertap(tap){
-				console.log('markertap---',tap);
-				this.noteMsg.title=this.i18n('api.message');
-				this.noteMsg.msg=this.i18n('index.querenxzwz');
-				this.noteMsg.lon=this.mapCenter.lon;
-				this.noteMsg.lat=this.mapCenter.lat;
-				this.noteMsg.markAddr=this.markAddr;
-				this.$refs.alertDialog.open('center');
-			},
-			anchorpointtap(tap){
-				console.log('anchorpointtap-----',tap);
-				this.noteMsg.markAddr=this.i18n('index.xianzaiwez');
-				this.noteMsg.lon=tap.detail.longitude;
-				this.noteMsg.lat=tap.detail.latitude;
-				this.noteMsg.title=this.i18n('api.message');
-				this.noteMsg.msg=this.i18n('index.querenxzwz');
-				this.$refs.alertDialog.open('center');
-			},
-			listMarkertap(tap){
-				var addr;
-				if(this.type==0){
-					this.bdtogps(tap,1);
-				}
-				else if(this.type==1){
-					addr={
-						address: tap.vicinity,
-						name:tap.name,
-						longitude:tap.geometry.location.lng, 
-						latitude: tap.geometry.location.lat, 
-					}
-					uni.setStorageSync('tempLocation',addr);
-					uni.setStorageSync('userAddrLocation',addr);
-					uni.navigateBack();
-				}
-			},
-			
-			addrselect(tap){
-				var addr;
-				if(this.type==0){
-					this.bdtogps(tap,0);
-				}
-				else if(this.type==1){
-					addr={
-						address: tap.vicinity,
-						name:tap.name,
-						longitude:tap.geometry.location.lng, 
-						latitude: tap.geometry.location.lat, 
-					}
-					uni.setStorageSync('tempLocation',addr);
-					uni.setStorageSync('userAddrLocation',addr);
-					if(this.chakanzb){
-						uni.redirectTo({
-							url:'/pages/UserCenter/dizhi/newdizhi?id=-1'
-						});
-					}
-					else{
-						uni.navigateBack();
-					}
-				}
-			},
-			
-			dialogConfirm() {
-				console.log('点击确认')
-				
-				var addr={
-					address:this.noteMsg.markAddr,
-					name:'',
-					longitude:this.noteMsg.lon, 
-					latitude: this.noteMsg.lat, 
-				}
-				uni.setStorageSync('tempLocation',addr);
-				uni.setStorageSync('userAddrLocation',addr);
-				setTimeout(()=>{
-					uni.navigateBack();
-				},200);
-				
-			},
-			dialogClose() {
-				console.log('点击关闭')
-			},
-			setCenter(){
-				//console.log('setCenter',this.left,this.top)
-				this.controls=[
-					// {//在地图上显示控件，控件不随着地图移动
-					// 	id:1,//控件id
-					// 	iconPath:'/static/images/Rdizhil@3x.png',//显示的图标   
-					// 	clickable:true,
-					// 	position:{//控件在地图的位置
-					// 	    left:158,
-					// 	    top:150-36,
-					// 	    width:36,
-					// 	    height:36
-					// 	},    
-					// },
-					{//在地图上显示控件，控件不随着地图移动
-					id:2,//控件id
-					iconPath:'/static/images/dingwei.png',//显示的图标 
-					clickable:true,
-					position:{//控件在地图的位置
-					    left:365,
-					    top:285,
-					    width:40,
-					    height:40
-						},    
-					},
-				];
-				
-			},
-			gcj02towgsM(latitude,longitude){
-				
-				api('gcj02towgs',{
-					lng:longitude,
-					lat:latitude
-				},r=>{
-					console.log('gcj02towgs:',r);
-					let str = r.data.data;
-					let s = str.split(',');
-					this.movetoCenter(s[1],s[0],false);
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			
-			gcj02towgs(latitude,longitude){
-				api('gcj02towgs',{
-					lng:longitude,
-					lat:latitude
-				},r=>{
-					console.log('gcj02towgs:',r);
-					let str = r.data.data;
-					let s = str.split(',');
-					if(s.length>1){
-						var latlon= s[1]+','+s[0];
-						console.log('----1',latlon);
-						//this.movetoCenter(s[1],s[0],false);
-						this.getAreaCode(latlon);
-					}
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			
-			gcj02towgsB(addr,type){
-				api('gcj02towgs',{
-					lng:addr.longitude,
-					lat:addr.latitude
-				},r=>{
-					console.log('gcj02towgs:',r);
-					let str = r.data.data;
-					let s = str.split(',');
-					var tpaddr={
-						address:addr.address,
-						name:'',
-						longitude:s[0], 
-						latitude:s[1], 
-					}
-					uni.setStorageSync('tempLocation',tpaddr);
-					uni.setStorageSync('userAddrLocation',tpaddr);
-					uni.navigateBack();
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			
-			querendizhi(index){
-				var addr;
-				var poi=this.pois[index];
-				console.log(index,poi);
-				if(this.type==0){
-					//this.movetoCenter(poi.point.y,poi.point.x,false);
-					this.setLocat(poi.point.y,poi.point.x,5,3);//百度API查询结果bd09ll转为gcj02显示在百度地图上
-					var tap={
-						point:{
-							x:poi.point.y,
-							y:poi.point.x
-						},
-						addr:'',
-						name:''
-					}
-					this.bdtogps(tap,2);
-				}
-				else if(this.type==1){
-					this.movetoCenter(poi.geometry.location.lat,poi.geometry.location.lng,false);//谷歌返回GPS直接在Google显示
-					//this.setLocat(poi.geometry.location.lat,poi.geometry.location.lng,1,5);//谷歌返回GPS转为转为gcj02显示在百度地图上
-					// var latlon= poi.geometry.location.lat+','+poi.geometry.location.lng;
-					// that.getAreaCode(latlon);
-				}
-				return;
-			},
-			setLocat(latitude,longitude,f,t){
-				var latlng = longitude+','+latitude;
-				api('setLocat',{
-					latlng:latlng,
-					from:f,
-					to:t
-				},r=>{
-					console.log('setLocat:',r);
-					this.movetoCenter(r.data.data.result[0].y,r.data.data.result[0].x,false);
-				},failc=>{
-					//console.log('getadvertis----',failc)
-				})
-			},
-			//bd09ll 转  GPS
-			bdtogps(tap,type){
-				var latlng = tap.point.x+','+tap.point.y;
-				api('setLocat',{
-					latlng:latlng,
-					from:5,
-					to:3
-				},r=>{
-					console.log('bdtogps1:',r);
-					api('gcj02towgs',{
-						lng:r.data.data.result[0].x,
-						lat:r.data.data.result[0].y
-					},res=>{
-						console.log('bdtogps2:',res);
-						var s = res.data.data.split(',');
-						if(type==2){
-							var latlon= s[1]+','+s[0];
-							//console.log('----1',latlon);
-							this.getAreaCode(latlon);
-							return;
-						}
-						var	addr={//bd09ll 转  GPS
-							address:tap.addr, 
-							name:tap.name,
-							longitude:s[0], 
-							latitude:s[1], 
-						}
-						uni.setStorageSync('tempLocation',addr);
-						uni.setStorageSync('userAddrLocation',addr);
-						if(type==0){
-							if(this.chakanzb){
-								uni.redirectTo({
-									url:'/pages/UserCenter/dizhi/newdizhi?id=-1'
-								});
-							}
-							else{
-								uni.navigateBack();
-							}
-						}
-						else if(type==1){
-							uni.navigateBack();
-						}
-					},failc=>{
-						//console.log('getadvertis----',failc)
-					})
-				},failc=>{
-						//console.log('getadvertis----',failc)
-				})
-			},
-		}
-	}
-</script>
-
-<style>
-	.mapbody{
-		width: 750rpx;
-	}
-	.mapcontentV{
-		margin-top: 20rpx;
-		width: 750rpx;
-		background-color: bisque;
-	}
-	.contensb{
-		display: flex;
-		flex-direction: column;
-		justify-content:flex-start;
-		width: 750upx;
-	}
-	
-	.scrollVct{
-		width: 750upx;
-	}
-	
-	.itemContent{
-		width: 740upx;
-		margin-left: 5upx;
-		padding: 10rpx;
-		border-bottom-width: 2rpx;
-		border-bottom-color:lightgray;
-		align-items: center;
-	}
-	
-	.addrName{
-		width: 580upx;
-		margin-left:10rpx;
-		font-size: 32rpx;
-		color: black;
-		height: 36rpx;
-		line-height: 36rpx;
-		/* overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 1;
-		-webkit-box-orient: vertical; */
-	}
-	.addrNamedetlV{
-		display: flex;
-		width: 100%;
-		margin-left: 10rpx;
-		height: 100rpx;
-		align-items: center;
-	}
-	.addrNamedetl{
-		text-align: left;
-		width: 580upx;
-		margin-left: 10rpx;
-		font-size: 28rpx;
-		color:darkslategrey;
-		padding: 10rpx;
-	}
-	.popocontenv{
-		background-color: cornflowerblue;
-		border-radius: 16rpx 16rpx 0rpx 0rpx;
-	}
-	.itemViewTop{
-		display: flex;
-		background-color:whitesmoke;
-		width: 100vw;
-		padding: 10rpx;
-		height: 70rpx;
-		justify-content: center;
-		align-items: center;
-		text-align: center;
-		box-shadow: 0rpx 0rpx -10rpx 0rpx #00A6FF;
-	}
-	.itemTextTop{
-		text-align: center;
-		font-size: 32rpx;
-		color: black;
-	}
-	.itemView{
-		width: 100vw;
-		padding: 10rpx;
-		height: 100rpx;
-		background-color: white;
-		text-align: center;
-		
-	}
-	.itemTextA{
-		width: 80vw;
-		height: 70rpx;
-		border-radius: 20rpx;
-		line-height: 70rpx;
-		text-align: center;
-		font-size: 32rpx;
-		color: white;
-		background-color: #00A6FF;
-		box-shadow: 0rpx 0rpx 10rpx 0rpx #00A6FF;
-	}
-	
-	.itemTextB{
-		width: 80vw;
-		height: 70rpx;
-		border-radius: 20rpx;
-		line-height: 70rpx;
-		text-align: center;
-		font-size: 32rpx;
-		color: white;
-		background-color: sandybrown;
-		box-shadow: 0rpx 0rpx 10rpx 0rpx sandybrown;
-	}
-	
-
-</style>

msdYongHu/pages/UserCenter/userMsgMenager.vue → msdYongHu/pages/UserCenter/userinfoSet.vue

@@ -9,13 +9,7 @@
 			<text class="tittext">{{$t('user.nicheng')}}:</text>
 			<input class="noinputV" type="text" :placeholder="$t('user.qingshuryhnc')" :value="nikename"  @input="phoneinput">
 		</view>
-		<view class="yzmlist bottomline">
-			<text class="tittext">e-mail:</text>
-			<input class="noinputV" type="text" :placeholder="$t('user.qingtianxndyx')" :value="email"  @input="smsCodeinput">
-		</view>
-		<!-- <view class="yzmctV">
-			<input class="noinputV" type="text" :placeholder="$t('user.qingtianxndyx')" :value="email" @input="smsCodeinput">
-		</view> -->
+		
 		<view class="yzmctV">
 			<radio-group @change="radioChange">
 			  <radio value="0" :checked="sex==0" />
@@ -203,4 +197,4 @@
 		box-shadow: 0rpx 0rpx 10rpx 0rpx #40AE36;
 	}
 
-</style>
+</style>

msdYongHu/pages/UserCenter/yonghushezhi/shezhi.vue

@@ -14,7 +14,7 @@
 		</view>
 		<view class="versionV">
 			<view class="versionitem">
-				<text class="appname">CTE</text>
+				<!-- <text class="appname"></text> -->
 				<text v-if="isnewV" class="zuixinbb">{{$t('user.yishizxbb')}}: v{{versionMSG.versionName}}</text>
 				<text v-if="!isnewV" class="dangqbb">{{$t('user.dangqianbb')}}: v{{appversionN}}</text>
 				<text v-if="!isnewV" class="huoqubb" @click="checkgengxin">{{$t('user.huoquzxbb')}}: v{{versionMSG.versionName}}</text>

msdYongHu/pages/api/api.js

@@ -3,11 +3,6 @@
 import ApibaseUrl from "@/config/urlConfig.js"
 const ApiUrl = ApibaseUrl.getApibaseUrl();
 
-
-
-
-
-
 const getdata = function(api,data,successc,failc){
 	//获取版本号
 	if(api=='getversion'){
@@ -710,7 +705,6 @@ const md5pay = '/pay/md5pay?';
 		})
 	}
 //-------------------------------------------------
-	const getuserfootlist = '/system/order/getuserfootlist';
 	//我的足迹
 	if(api=='getuserfootlist'){
 		uni.request({
@@ -1105,6 +1099,25 @@ const md5pay = '/pay/md5pay?';
 		    },
 		})
 	}
+	//获取广告图片
+	if(api=='getAds'){
+		uni.request({
+		    url:ApiUrl+'/app/ads/getAds',
+			method:"GET",
+			sslVerify:false,
+			data:data,
+		    header: {
+		      'Content-Type': 'application/json',
+			  'token':getApp().globalData.token
+		    },
+		    success: res=> {
+		    	successc(res);
+		    },
+		    fail: function (err) {
+		    	failc(err);
+		    },
+		})
+	}
 	//获取售后客服列表
 	if(api=='kefuMsgList'){
 		uni.request({

msdYongHu/pages/api/restapi.js

@@ -1,133 +0,0 @@
-class RestApi {
-    //用户数据示例
-    users = [
-        {
-            id: '08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a',
-            name: 'Mattie',
-            password: '123',
-            avatar: '/static/images/Avatar-1.png',
-            email: 'Mattie@goeasy.io',
-            phone: '138xxxxxxxx',
-        },
-        {
-            id: '3bb179af-bcc5-4fe0-9dac-c05688484649',
-            name: 'Wallace',
-            password: '123',
-            avatar: '/static/images/Avatar-2.png',
-            email: 'Wallace@goeasy.io',
-            phone: '138xxxxxxxx',
-        },
-        {
-            id: 'fdee46b0-4b01-4590-bdba-6586d7617f95',
-            name: 'Tracy',
-            password: '123',
-            avatar: '/static/images/Avatar-3.png',
-            email: 'Tracy@goeasy.io',
-            phone: '138xxxxxxxx',
-        },
-        {
-            id: '33c3693b-dbb0-4bc9-99c6-fa77b9eb763f',
-            name: 'Juanita',
-            password: '123',
-            avatar: '/static/images/Avatar-4.png',
-            email: 'Juanita@goeasy.io',
-            phone: '138xxxxxxxx',
-        },
-    ];
-    //群数据示例
-    groups = [
-        {
-            id: 'group-a42b-47b2-bb1e-15e0f5f9a19a',
-            name: '小程序交流群',
-            avatar: '/static/images/wx.png',
-            userList: [
-                '08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a',
-                '3bb179af-bcc5-4fe0-9dac-c05688484649',
-                'fdee46b0-4b01-4590-bdba-6586d7617f95',
-                '33c3693b-dbb0-4bc9-99c6-fa77b9eb763f',
-            ],
-        },
-        {
-            id: 'group-4b01-4590-bdba-6586d7617f95',
-            name: 'UniApp交流群',
-            avatar: '/static/images/uniapp.png',
-            userList: [
-                '08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a',
-                'fdee46b0-4b01-4590-bdba-6586d7617f95',
-                '33c3693b-dbb0-4bc9-99c6-fa77b9eb763f',
-            ],
-        },
-        {
-            id: 'group-dbb0-4bc9-99c6-fa77b9eb763f',
-            name: 'GoEasy交流群',
-            avatar: '/static/images/goeasy.jpeg',
-            userList: ['08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a', '3bb179af-bcc5-4fe0-9dac-c05688484649'],
-        },
-    ];
-    // 订单
-    orders = [
-        {
-            id: '252364104325',
-            url: '/static/images/goods1-1.jpg',
-            name: '青桔柠檬气泡美式',
-            price: '￥23',
-            count: 1
-        },
-        {
-            id: '251662058022',
-            url: '/static/images/goods1-2.jpg',
-            name: '咸柠七',
-            price: '￥8',
-            count: 2
-        },
-        {
-            id: '250676186141',
-            url: '/static/images/goods1-3.jpg',
-            name: '黑糖波波鲜奶茶',
-            price: '￥12',
-            count: 1
-        }
-    ];
-
-    findUsers() {
-        return this.users;
-    };
-
-    findFriends(user) {
-        return this.users.filter((v) => v.id !== user.id);
-    }
-
-    findGroups(user) {
-        return this.groups.filter((v) => v.userList.find((id) => id === user.id));
-    }
-
-    findUser(username, password) {
-        return this.users.find((user) => user.name === username && user.password === password);
-    }
-
-    getOrderList() {
-        return this.orders;
-    }
-
-    findGroupById(groupId) {
-        return this.groups.find((group) => group.id === groupId);
-    }
-
-    findUserById(userId) {
-        return this.users.find((user) => user.id === userId);
-    }
-
-    findGroupMembers (groupId) {
-        let members = [];
-        let group = this.groups.find(v => v.id === groupId);
-        this.users.map(user => {
-            let userId = group.userList.find((id)=>{
-                return id === user.id;
-            });
-            members.push(user);
-        });
-        return members;
-    }
-}
-
-export default new RestApi();

msdYongHu/pages/company/companysvList.vue

@@ -1,51 +0,0 @@
-<template>
-	<view>
-		<customNav :shownav="true" :title="$t('index.qiyefuwu')" titledetl=""></customNav>
-		<uni-list>
-		    <uni-list-item :show-extra-icon="true" showArrow  :title="$t('comp.qiyejs')" @click="listClick(1)" link/>
-			<uni-list-item :show-extra-icon="true" showArrow  :title="$t('comp.qiyegw')" @click="listClick(2)" link/>
-			<uni-list-item :show-extra-icon="true" showArrow  :title="$t('comp.shangjiarz')" @click="listClick(3)" link/>
-			<uni-list-item :show-extra-icon="true" showArrow  :title="$t('comp.zhmwmy')" @click="listClick(4)" link/>
-		</uni-list>
-	</view>
-</template>
-
-<script>
-	import uniList from '@/uni_modules/uni-list/uni-list.vue';
-	import uniListItem from '@/uni_modules/uni-list-item/uni-list-item.vue';
-	import uniAd from '@/uni_modules/uni-list-ad/uni-list-ad.vue';
-	import uniChat from '@/uni_modules/uni-list-chat/uni-list-chat.vue';
-		export default {
-			components:{
-				uniList,uniListItem,uniAd,uniChat
-			},
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			listClick(e){
-				uni.navigateTo({
-					url:'/pages/UserCenter/LoginView'
-				})
-				switch(e){
-					case 1:
-					
-					break;
-					case 2:
-					
-					break;
-					case 3:
-					
-					break;
-					case 4:
-					}
-			}
-		}
-	}
-</script>
-
-<style>
-
-</style>

msdYongHu/pages/component/mynavbar/mynavbar.vue

@@ -16,10 +16,10 @@
 				</view>
 			</view>
 			
-			<view class="rightconten">
+			<!-- <view class="rightconten">
 				<image class="interest" src="/static/meishi/notifcation.png" mode="aspectFit" @click="leftbuttonsel(2)"></image>
 				
-			</view>
+			</view> -->
 		</view>
 		<view class="contentColumnC">
 			<uni-search-bar class="searchbar" :placeholder="$t('index.searchgoods')" cancelButton="none" locateButton="always" :readonly="readonly" v-on:searchClick="searchClick"></uni-search-bar>

msdYongHu/pages/imcall/GoeasyExchange.vue

@@ -133,14 +133,6 @@
 		  <image @click="imcall()" class="operation-icon" src="/static/goimge/jietong.png"></image>
 		  <view class="operation-title">{{$t('GoeasyExchange.tonghua')}}</view>
 		</view>
-        <!-- <view class="more-icon">
-          <image @click="sendVideoMessage()" class="operation-icon" src="/static/goimge/video.png"></image>
-          <view class="operation-title">视频</view>
-        </view>
-        <view class="more-icon">
-          <image @click="showOrderMessageList()" class="operation-icon" src="/static/goimge/order.png"></image>
-          <view class="operation-title">订单</view>
-        </view> -->
       </view>
     </view>
     <view class="action-popup" @touchmove.stop.prevent v-if="actionPopup.visible">
@@ -188,7 +180,6 @@
 
 <script>
   import EmojiDecoder from '@/pages/api/EmojiDecoder.js';
-  import restApi from '@/pages/api/restapi';
   import {formatDate} from '@/pages/api/utils';
  
   const IMAGE_MAX_WIDTH = 200;
@@ -918,10 +909,7 @@
       chooseEmoji(emojiKey) {
         this.text += emojiKey;
       },
-      showOrderMessageList() {
-        this.orderList.orders = restApi.getOrderList();
-        this.orderList.visible = true;
-      },
+      
       hideOrderMessageList() {
         this.orderList.visible = false;
       },

msdYongHu/pages/index/fuwuleixingList.vue

@@ -73,7 +73,7 @@
 			},
 			mendianxuanze(id){
 				uni.navigateTo({
-					url:'/pages/shanpinxungou/shangjia/shangjiaView?id='+id+'&isShangjia=0'
+					url:'/pages/shanpinxungou/shangjia/merchantdetail?id='+id+'&isShangjia=0'
 				})
 			},
 			getserverlist(page){

msdYongHu/pages/index/index.vue

@@ -1,52 +1,935 @@
 <template>
-	<view class="content">
-		<image class="logo" src="/static/logo.png"></image>
-		<view class="text-area">
-			<text class="title">{{title}}</text>
+	<view class="drawer">
+		<mynavbar class="mynavbarV" :title="Btitle" :titledetl="Btitledetl" :interestBT="0" :mycartBT="1" v-on:Enavbarsel="navbarsel"></mynavbar>
+		<view :style="{marginTop: vMtop+'rpx'}">
+			<swiperImgs v-if="cuxiaoImge.length>0" style="margin-top: 20rpx;" width="750" height="380" :imageList="cuxiaoImge"></swiperImgs>
+			<listitemB ref="flList" v-on:Efenleixuanze="fenleixuanze"></listitemB>
+			<!-- <fenleiList ref="fwfenlei" v-on:Efwflxuanze="fwflxuanze"></fenleiList> -->
+			<!-- <listItemD v-on:Emendianxuanze="mendianxuanze" :mendianList="mendianList" :title="$t('index.remenct')"></listItemD> -->
+			<!-- <listItemC ref="flList" v-on:Efenleixuanze="fenleixuanze"></listItemC> -->
+			
 		</view>
-	</view>
+		<view class="contentColumnC" style="margin-top: 10rpx;">
+			<view class="contentInRowS" style="width: 92%;">
+				<view class="contentColumnC" @click="BtStatesl(-1)">
+					<text class="toptext" :style="BtState==-1?'color:#40AE36':'color:black'">附近美食</text>
+					<!-- <text class="motext" :style="BtState==-1?'background-color:#40AE36;color:white':'background-color:white;color:darkgray'">猜你喜欢</text> -->
+				</view>
+				<!-- <text style="height: 60rpx;width: 2rpx;background-color:darkgray;"></text> -->
+				<!-- <view class="contentColumnC" @click="BtStatesl(3)">
+					<text class="toptext" :style="BtState==3?'color:#40AE36':'color:black'">最快</text>
+					<text class="motext" :style="BtState==3?'background-color:#40AE36;color:white':'background-color:white;color:darkgray'">距离最近</text>
+				</view>
+				<text style="height: 60rpx;width: 2rpx;background-color: cadetblue;"></text>
+				<view class="contentColumnC" @click="BtStatesl(2)">
+					<text class="toptext" :style="BtState==2?'color:#40AE36':'color:black'">优惠</text>
+					<text class="motext" :style="BtState==2?'background-color:#40AE36;color:white':'background-color:white;color:darkgray'">折扣最低</text>
+				</view>
+				<text style="height: 60rpx;width: 2rpx;background-color: cadetblue;"></text>
+				<view class="contentColumnC" @click="BtStatesl(0)">
+					<text class="toptext" :style="BtState==0?'color:#40AE36':'color:black'">人气</text>
+					<text class="motext" :style="BtState==0?'background-color:#40AE36;color:white':'background-color:white;color:darkgray'">大家在买</text>
+				</view> -->
+			</view>
+			<!-- <view class="contentColumnC" style="margin-top: 16rpx;">
+				<view class="item_content" v-for="(item,index) in fjmendian" @click="mendianxuanze(item.id)">
+					<imageconver :isremen="true" :isyouhui="false" :youhuinote="''" class="mainimage" :imagSrc="item.image"></imageconver>
+					<view class="titletext textfontB3">
+						<text>{{item.posName}}</text>
+					</view>
+					<text class="Dishes">{{item.area}}</text>
+					<view class="price textfontB5">
+						<text>{{$t('index.manX')}} {{$formPr(item.posPrice)}}{{$t('locale.huobidw')}}</text>
+					</view>
+				</view>
+			</view> -->
+			<view class="contentColumnC" style="margin-top: 16rpx;">
+				<view class="item_content" v-for="(item,index) in fjmendian" @click="mendianxuanze(item.id)">
+					<view class="contentInRowS">
+						<netImage width="130" height="130" bradius="65" :mysrc="item.logo" mymode="scaleToFill"></netImage>
+						<view class="contentColumn" style="width:520rpx ;">
+							<text class="text2row" style="font-size: 30rpx;">{{item.posName}}</text>
+							<view class="contentInRowS">
+								<text style="font-size: 26rpx;color: brown;">{{item.pingf}}分</text>
+								<text style="font-size: 26rpx;color: green;">月售{{item.ddsl}}+</text>
+							</view>
+							<view class="contentInRowS">
+								<text style="font-size: 26rpx;color:dimgrey;">{{item.posPrice}}起送</text>
+								<text style="font-size: 26rpx;">距離{{item.juli}}Km</text>
+							</view>
+							<view class="contentInRowL">
+								<text class="notTextA" style="font-size: 28rpx;">新客優惠</text>
+								<text class="notTextA" style="font-size: 28rpx;">超好吃</text>
+							</view>
+						</view>
+					</view>
+					<view class="">
+						<scroll-view scroll-view  scroll-x="true" >
+							<view class="item_list">
+								<view v-for="(item1, index) in item.foodList">
+									<view class="itemA_content">
+										<netImage width="130" height="130" :mysrc="item1.image" mymode="scaleToFill"></netImage>
+										<view class="contentColumnC title">
+											<text class="text2row" >{{item1.name}}</text>
+											<text>{{item1.price}}</text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<popViewGG :tips="$t('user.xiazaijindu')" :show="show" :maskClosable="false" :isCancel="false">
+			<view class="words">
+				<text>{{$t('user.xiazaizhong')}} {{percentVal}}%</text>
+			</view>
+		</popViewGG>
+		<popViewGG :tips="$t('index.dizhixuanz')" :show="showaddrs" :maskClosable="true" :isCancel="false" :acttips="$t('index.qitadizhi')" @chooseCancel="chooseCancel">
+			<view class="contentColumnC" style="width: 90%;margin-left: 5%;">
+				<view class="itemView" v-for="(item,index) in addrList" @click="addrselct(item)">
+					<text class="addrV textfontB5">{{item.address}}</text>
+				</view>
+				<view class="contentInRowC itemViewoth" style="margin-top: 20rpx;margin-bottom: 30rpx;" @click="ClickCancel">
+					<text class="addrV textfontB4" style="color: white;">{{$t('index.qitadizhi')}}</text>
+				</view>
+			</view>
+		</popViewGG>
+		<uni-popup style="z-index: 999;" ref="popYsxy" type="center" :isMaskClick="false" :safeArea="true">
+			<ysxyView v-on:EagrResult="agrResult"></ysxyView>
+		</uni-popup>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				title: 'Hello'
+  import mynavbar from "@/pages/component/mynavbar/mynavbar.vue";
+  import listItemC from "@/pages/component/listItemC/listItemC.vue";
+  import listItemD from "@/pages/component/listItemD/listItemD.vue";
+  import listitemB from "@/pages/component/listitemB/listitemB.vue";
+  
+ import api from "@/pages/api/api.js"
+  export default {
+	  components:{
+		  mynavbar,
+		  listItemC,
+		  listItemD,
+		  listitemB
+	  },
+    data() {
+      return {
+		cuxiaoImge:[],
+        systemLocale: '',
+        applicationLocale: '',
+		Btitle:'',
+		Btitledetl:'',
+		latitude:10.721347,
+		longitude:106.713463,
+		addrList:[],
+		open: false,
+		isActive: false,
+		goods:[],
+		mendianList:[],
+		readonly:true,
+		versionMSG:[],
+		appVersionCode:0,
+		updateUrl:'',
+		tishigx:true,
+		show:false,
+		showaddrs:false,
+		percentVal:'',
+		juli:0,
+		searchBrH:120,
+		vMtop:0,
+		BtState:-1,
+		fjmendian:[],
+		page:1
+      }
+    },
+    onLoad() {
+		//this.ringoffImCall();
+		var tempjuli=uni.getStorageSync('FuWujuli');
+		if(''==tempjuli||null==tempjuli||undefined==tempjuli){
+			this.juli=10;
+		}
+		else{
+			this.juli=tempjuli;
+		}
+		var info = uni.getSystemInfoSync();
+		//console.log(info);
+		this.appVersionCode=info.appVersionCode;
+		this.statusBarHeight=info.statusBarHeight*4+60;
+		this.vMtop=this.statusBarHeight+this.searchBrH;
+		
+		var yszche=uni.getStorageSync('yszche');
+		if(1!=yszche){
+		}
+		else{
+			var tempjuli=uni.getStorageSync('FuWujuli');
+			if(''==tempjuli||null==tempjuli||undefined==tempjuli){
+				this.juli=10;
+			}
+			else{
+				this.juli=tempjuli;
 			}
+			uni.setStorageSync("latitude",this.latitude);
+			uni.setStorageSync("longitude",this.longitude);
+			// this.gethostmendianlist(1);
+			this.MYgetLocation();
+		}
+    },
+	
+	onReady() {
+		var yszche=uni.getStorageSync('yszche');
+		if(1!=yszche){
+			this.$refs.popYsxy.open('center');
+			uni.hideTabBar();
+		}
+		else{
+		}
+		// this.$refs.fwfenlei.getfenleiList();
+	},
+	
+	onShow() {
+		var yszche=uni.getStorageSync('yszche');
+		if(1!=yszche){
+			return;
+		}
+		this.cuxiaoList();
+		var tempjuli=uni.getStorageSync('FuWujuli');
+		if(''==tempjuli||null==tempjuli||undefined==tempjuli){
+			this.juli=10;
+		}
+		else{
+			this.juli=tempjuli;
+		}
+		console.log('this.juli',this.juli)
+		this.chongxindenglu();
+		if(this.tishigx){
+			this.tishigx=false;
+		}
+		else{
+			this.gettempLocate();
+			this.$refs.flList.getmendianfenlei();
+			//this.$refs.fwfenlei.getfenleiList();
+		}
+	},
+	
+    methods: {
+		checkdingdan(){
+			//getApp().globalData.iosfl(1);
 		},
-		onLoad() {
-
+		cuxiaoList(){
+			
+			api('getAds',{
+				mdId:'',
+				price:''
+			},r=>{
+				console.log('-----------',r)
+				if(r.data.code==200){
+					this.cuxiaoImge=[];
+					var objs = r.data.data;
+					for(var i=0;i<objs.length;i++){
+						var obj=objs[i];
+						if(obj.poster&&obj.poster.length>0){
+							this.cuxiaoImge.push(obj.poster);
+						}
+					}
+				}
+			},failc=>{
+				//console.log('getadvertis----',failc)
+			})
 		},
-		methods: {
-
+		//获取自己最近收货地址
+		getzuijinaddress(latitude,longitude){
+			api('getzuijinaddress',{
+				latitude:latitude,
+				longitude:longitude
+			},res=>{
+				if(res.data.code!=200){
+					return;
+				}
+				this.addrList=res.data.data;
+				console.log('11113');
+			},failc=>{
+				//console.log('getadvertis----',failc)
+			})
+		},
+	//获取当前定位
+	 MYgetLocation(){
+		 console.log('MYgetLocation');
+		var that = this;
+	 	uni.getLocation({
+	 		type:"wgs84", //默认为 wgs84 返回 gps 坐标//谷歌地图使用 wgs84 坐标，其他地图使用 gcj02 坐标
+	 		geocode: "true",
+	 		isHighAccuracy: "true",
+	 		accuracy: "best", // 精度值为20m
+	 		success: function (res) {
+	 		  console.log("定位获取:", res);
+			  that.latitude=res.latitude;
+			  that.longitude=res.longitude;
+			  var latlon= that.latitude+','+that.longitude;
+			  // that.Btitle=latlon;
+			  uni.setStorageSync("latitude",that.latitude);
+			  uni.setStorageSync("longitude",that.longitude);
+			  // that.gethostmendianlist(1);
+			  that.getMeishidafjmd(0,1);
+			  that.getzuijinaddress(that.latitude,that.longitude);
+			  that.getAreaCode(latlon);
+	 		},
+			fail(err) {
+				console.log(err);
+				if(that.Btitledetl==''){
+					uni.showToast({
+					    title:that.$t('api.dingweishibai'),
+					    icon: 'none',
+					    duration: 3000
+					})
+				}
+			}
+	 	});
+	},
+	//获取地图选点返回
+	gettempLocate(){
+		var that =this;
+		try {//读取
+			var data = uni.getStorageSync("userAddrLocation");
+			if(''==data || undefined==data || null==data){
+				// that.gethostmendianlist(1);
+				that.getMeishidafjmd(0,1);
+				that.getzuijinaddress(that.latitude,that.longitude);
+				return;
+			}
+			else{
+				
+				that.latitude=data.latitude;
+				that.longitude=data.longitude;
+				uni.setStorageSync("latitude",that.latitude);
+				uni.setStorageSync("longitude",that.longitude);
+				that.Btitle=data.name;
+				that.Btitledetl=data.address;
+				// that.gethostmendianlist(1);
+				that.getMeishidafjmd(0,1);
+				uni.setStorageSync('userAddrLocation',"");
+				uni.setStorageSync('tempLocation','');
+				that.getzuijinaddress(that.latitude,that.longitude);
+				return;
+			}
+		} catch(e){//错误
+			return;
 		}
-	}
+	},
+	//获取附近地址
+	getAreaCode(latlng){
+		var userId = uni.getStorageSync('userId');
+		var that = this;
+		api('getAddr',{
+			latlng:latlng,
+			id:userId
+		},res=>{
+			//console.log('getAreaCode',res);
+			if(res.data.code!=200){
+				return;
+			}
+			this.Btitle=res.data.data.name;
+			this.Btitledetl=res.data.data.address;
+		},failc=>{
+			//console.log('getadvertis----',failc)
+		})
+		
+	},
+	dowithAddr(r,type){
+		console.log(r);
+		if(type==0){
+			if(r.result.pois.length>0){
+				this.Btitledetl=r.result.formatted_address;
+			}
+		}
+		else if(type==1){
+			if(r.results.length>0){
+				this.Btitledetl=r.results[1].vicinity;
+			}
+		}
+	},
+	//
+	navbarsel(item){
+		console.log('navbarsel')
+		if(item==1){
+			if(this.addrList.length>0){
+				this.showaddrs=true;
+			}
+			else{
+				uni.navigateTo({
+					url:'/pages/UserCenter/map/Chazhaodizhi'
+				})
+			}
+		}
+		if(item==2){
+			uni.navigateTo({
+				url:'/pages/shanpinxungou/shangpin/shangpinList/shangpinList'
+			})
+		}
+	},
+	addrselct(item){
+		this.latitude=item.latitude;
+		this.longitude=item.longitude;
+		uni.setStorageSync("latitude",this.latitude);
+		uni.setStorageSync("longitude",this.longitude);
+		this.Btitle='';
+		this.Btitledetl=item.address;
+		// this.gethostmendianlist(1);
+		this.getMeishidafjmd(0,1);
+		this.showaddrs=false;
+	},
+	chooseCancel(){
+		this.showaddrs=false;
+	},
+	ClickCancel(){
+		this.showaddrs=false;
+		console.log('ClickCancel');
+		uni.navigateTo({
+			url:'/pages/UserCenter/map/Chazhaodizhi'
+		})
+	},
+	
+	//获取附近热门门店
+	gethostmendianlist(type){//0按照评分查询，1按照热度查询，2按照新开店时间查询
+		console.log(this.longitude,this.latitude)
+		var that = this;
+		api('getPfStore',{
+			longitude:this.longitude,
+			latitude:this.latitude,
+			page:1,
+			juli:this.juli,
+			type:type
+		},res=>{
+			console.log('getPfStore-----',res);
+			if(res.data.code==200){
+				this.mendianList=res.data.data;
+			}
+		},failc=>{
+			uni.showToast({
+				title: that.$t('api.wangluoshibai'),
+				icon: 'none',
+				duration: 2500
+			})
+		})
+		this.BtStatesl(this.BtState);
+	},
+	
+	//获取附近门店
+	getmendianlist(latitude,longitude){
+	 var that = this;
+	 that.fjmendian=[];
+	 api('getmendianlist',{
+		longitude:longitude,
+		latitude:latitude,
+		page:1,
+		area:'',
+		sort:'',
+		juli:that.juli
+	 },res=>{
+		//console.log('11',res);
+		if(res.data.data.length>0){
+			that.fjmendian=res.data.data;
+		}
+		else{
+			console.log('数据空')
+		}
+	 },failc=>{
+		uni.showToast({
+			title: that.$t('api.wangluoshibai'),
+			icon: 'none',
+			duration: 2500
+		})
+	 })
+	 
+	},
+	
+	//美食达 获取附近门店
+	getMeishidafjmd(type,page){
+		var that = this;
+		
+		var language = uni.getStorageSync('language');
+		if(language=='yuenan'){
+			language='vi';
+		}
+		if(language=='zh-Hans'){
+			language='zh-CN';
+		}
+		if(language=='zh-Hant'){
+			language='zh-TW';
+		}
+		
+		api('getStoreList',{
+				longitude:this.longitude,
+				latitude:this.latitude,
+				page:page,
+				flId:type,
+				language:language
+		},res=>{
+				console.log('getMeishidafjmd:',res.data.data.records);
+				if(res.data.data.records.length>0){
+					if(page==1){
+						that.fjmendian=res.data.data.records;
+					}
+					else{
+						
+						var temp = that.fjmendian;
+						for(var i=0;i<res.data.data.records.length;i++){
+							temp.push(res.data.data.records[i]);
+						}
+						that.fjmendian=temp;
+					}
+					
+				}
+				else{
+					console.log('数据空')
+					if(that.page>1){
+						that.page=that.page-1;
+					}
+				}
+		},failc=>{
+				uni.showToast({
+					title: that.$t('api.wangluoshibai'),
+					icon: 'none',
+					duration: 2500
+				})
+		})
+	},
+	
+	 fenleixuanze(e){
+		 uni.navigateTo({
+		 	url:'/pages/shanpinxungou/shangjia/shangjia?id='+e+'&latitude='+this.latitude+'&longitude='+this.longitude
+		 })
+		 return;
+	 },
+	 fwflxuanze(e){
+		 
+		 uni.navigateTo({
+		 	url:'/pages/index/fuwuleixingList?serverType='+e+'&latitude='+this.latitude+'&longitude='+this.longitude
+		 })
+		 return;
+	 },
+	 mendianxuanze(id){
+		 uni.navigateTo({
+		 	url:'/pages/shanpinxungou/shangjia/merchantdetail?id='+id+'&isShangjia=0'
+		 })
+	 },
+	 chongxindenglu(){
+	   var token = getApp().globalData.token;
+	   //console.log('chongxindenglu111',token);
+	   if(token == '' || token == undefined || token == null){
+	   	//console.log('chongxindenglu1112222');
+	   	return;
+	   }
+	   else{
+	   	//console.log('chongxindenglu111333');
+	   	this.gengxintoken(token);
+	   	return;
+	   }
+	 },
+	gengxintoken(token){
+	 	
+		api('refreshToken',{
+			token:getApp().globalData.token
+		},res=>{
+			if(res.data.code==200){
+				//console.log('refreshToken',res)
+				getApp().globalData.token = res.data.data;
+				uni.setStorageSync("token",res.data.data);
+				this.getCID();
+			}
+			else{
+				getApp().globalData.token = '';
+				uni.setStorageSync("token",'');
+				console.log('refreshToken',res)
+			}
+		},failc=>{
+			//console.log('getadvertis----',failc)
+		})
+	 },
+	 getCID(){
+		 var cid = uni.getStorageSync("cid");
+		 //console.log('客户端推送标识:',cid)
+		 if(cid==''||cid==null||cid==undefined){
+			 var that = this;
+			 uni.getPushClientId({
+			    success: (res) => {
+					console.log('客户端推送标识:',res.cid)
+					// uni.showToast({
+					// 	title:'客户端推送标识1:'+res.cid,
+					// 	icon: 'none',
+					// 	duration: 4000
+					// })
+					uni.setStorageSync("cid",res.cid);
+					that.updataUserMsg(res.cid);
+			     },
+			     fail(err) {
+					 uni.showToast({
+					 	title:'获取推送标识失败',
+					 	icon: 'none',
+					 	duration: 4000
+					 })
+			      console.log(err)
+			     }
+			 });
+		 }
+		 else{
+			 this.updataUserMsg(cid)
+		 }
+		 
+	 },
+	 updataUserMsg(cid){
+	 	api('updataUserMsg',{//159b0921b7ab3eb4f93a184d973b9fcb
+	 		"cid":cid,
+	 	},res=>{
+	 		console.log('updataUserMsg：',cid,res.data)
+	 	},failc=>{
+	 		//console.log('getadvertis----',failc)
+	 	})
+	 },
+	 //---------------------------------------------------
+	 agrResult(state){//隐私协议
+		 console.log(state);
+		 if(state==0){
+			if (plus.os.name.toLowerCase() === 'android') {
+				console.log('ios');
+				plus.runtime.quit();
+			}
+			else{
+				console.log('ios');
+				// const threadClass = plus.ios.importClass("NSThread");
+				// const mainThread = plus.ios.invoke(threadClass, "mainThread");
+				// plus.ios.invoke(mainThread, "exit");
+				 plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+			}
+		 }
+		 if(state==1){
+			 uni.showTabBar(); 
+			 this.$refs.popYsxy.close();
+			 uni.setStorageSync('yszche',1);
+			 var yszche=uni.getStorageSync('yszche');
+			 console.log(yszche);
+			 this.MYgetLocation();
+			 this.$refs.flList.getmendianfenlei();
+		 }
+		 if(state==2){
+			uni.navigateTo({
+				url:'/pages/index/mindex/yinszhengc'
+			})	 
+		 }
+	 },
+	 ringoffImCall(){
+	 	api('ringoff',{
+	 	},res=>{
+	 		console.log(res)
+	 	},failc=>{
+	 		//console.log('getadvertis----',failc)
+	 	})
+	 },
+	 //-------------------------------------------------
+	 BtStatesl(index){//附近 好评  新店
+	 this.BtState=index;
+		if(index==-1||index==3){
+			this.getmendianlist(this.latitude,this.longitude);
+			return;
+		}
+		this.getPfStore(this.BtState);
+	 },
+	 //查询附近高评分门店等----------------------------------------------------------
+	 getPfStore(type){//0按照评分查询，1按照热度查询，2按照新开店时间查询
+		this.fjmendian=[];
+		var that = this;
+		api('getPfStore',{
+			longitude:this.longitude,
+			latitude:this.latitude,
+			page:1,
+			juli:this.juli,
+			type:type
+		},res=>{
+			//console.log('getPfStore-----',res);
+			if(res.data.code==200){
+				this.fjmendian=res.data.data;
+			}
+		},failc=>{
+			uni.showToast({
+				title: that.$t('api.wangluoshibai'),
+				icon: 'none',
+				duration: 2500
+			})
+		})
+	 },
+	 //自动更新
+	 getVersion(){
+		 return;
+	 	var info = uni.getSystemInfoSync();
+	 	console.log(info);
+	 	if(info.platform.toLowerCase() != 'android'){
+	 		return;
+	 	}
+	 	var appVersionCode = info.appVersionCode;
+	 	var that = this;
+		
+		api('getversion',{
+			platform:'0',
+			name:'CTE'
+		},res=>{
+			console.log(res);
+			if(res.data.data){
+				var versionMSG=res.data.data;
+				if(appVersionCode<versionMSG.version){
+					uni.showModal({
+						cancelText: that.$t('order.quxiao'), // 取消按钮的文字
+						confirmText: that.$t('index.shengji'), // 确认按钮的文字 
+					    title: that.$t('api.message'),
+					    content: that.$t('index.yiyouxinban'),
+					    success: function (res) {
+							if (res.confirm) { //这里是点击了确定以后
+								var updateUrl='http://backend.amazeway.com.cn/androidApk/CTE.apk';
+								that.gengxinApp(updateUrl);
+							} else { //这里是点击了取消以后
+							  console.log('用户点击取消')
+							}
+							
+					    }
+					})
+				}
+			}
+		},failc=>{
+			//console.log('getadvertis----',failc)
+		});
+		
+	 	
+	 },
+	 gengxinApp(url){
+	 	console.log(url);
+	 	var that = this;					
+	 	var dtask = plus.downloader.createDownload(
+	 		url,
+	 		{
+	 			method: "GET"
+	 		}, (d, status) => {
+	 			console.log(status,d);
+	 			if (status == 200) {
+	 				plus.runtime.install(d.filename)
+	 			} else {
+	 				plus.nativeUI.alert('fail！' + status)
+	 			}
+	 	});
+	 	dtask.start();
+	 	var prg = 0;//进度数字化
+	 	var show= plus.nativeUI.showWaiting("Loading...");
+	 	var percentVal;
+	 	dtask.addEventListener('statechanged',function(task,status){
+	 		//console.log(task);
+	 		switch(task.state){//根据下载状态调整其显示内容
+	 			case 1:
+	 				percentVal = "Loading……";
+	 				show.setTitle("Loading……");
+	 				break;
+	 			case 2:
+	 				percentVal = "Connected";
+	 				show.setTitle("Connected");
+	 				break;
+	 			case 3:
+	 				percentVal = parseInt((parseFloat(task.downloadedSize) / parseFloat(task.totalSize)) * 100);
+	 				show.setTitle("Loading：" + percentVal + "%");
+	 				break;
+	 			case 4:
+	 				plus.nativeUI.closeWaiting();
+	 				
+	 				break;
+	 		}
+	 	});
+	 },
+    },
+	/**
+	 * 上拉加载回调函数
+	 */
+	onReachBottom() {
+		console.log('onReachBottom')
+		this.page=this.page+1;
+		this.getMeishidafjmd(0,this.page);
+	},
+  }
 </script>
 
-<style>
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
+<style scoped lang="scss">
+  .contentbg{  
+	  margin-top: 240rpx;
+  }
+	.mynavbarV{
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		z-index: 9998;
+		//background-color: #00A6FF;
+		background-image: url("/static/background/indextopB.png");
+		/* background-image: url("/static/images/wodetop.jpg"); */
+		background-size: cover;
+		background-position: center bottom;
 	}
 
-	.logo {
-		height: 200rpx;
-		width: 200rpx;
-		margin-top: 200rpx;
-		margin-left: auto;
-		margin-right: auto;
-		margin-bottom: 50rpx;
-	}
-
-	.text-area {
-		display: flex;
-		justify-content: center;
-	}
-
-	.title {
-		font-size: 36rpx;
-		color: #8f8f94;
-	}
+  .drawer{
+	  width: 100%;
+	  padding-bottom: 100rpx;
+	  position: absolute;
+	  background-color: whitesmoke;
+  }
+  .words{
+  	width: 100%;
+  	text-align: center;
+  	font-size: 30rpx;
+  	height: 80rpx;
+  	line-height: 80rpx;
+  }
+  .itemView{
+	background-color: white;
+	height: 80rpx;
+	width: 100%;
+  	margin: 10rpx;
+  	padding: 16rpx;
+  	display: flex;
+  	flex-direction: row;
+  	align-items: center;
+  	justify-content:flex-start;
+  	border-radius: 20rpx;
+  	box-shadow: 0rpx 0rpx 10rpx 0rpx darkgray;
+  }
+  
+  .itemViewoth{
+  	background-color: #40AE36;
+  	height: 60rpx;
+  	width: 100%;
+  	margin: 10rpx;
+  	padding: 16rpx;
+  	display: flex;
+  	flex-direction: row;
+  	align-items: center;
+  	justify-content:center;
+  	border-radius: 20rpx;
+  	box-shadow: 0rpx 0rpx 10rpx 0rpx #40AE36;
+  }
+  
+  .addrV{
+  	color: black;
+  	overflow: hidden;
+  	text-overflow: ellipsis;
+  	display: -webkit-box;
+  	-webkit-line-clamp: 2;
+  	-webkit-box-orient: vertical;
+  }
+  
+  .tipyLBt{
+  	font-size: 28rpx;
+  	width: 33%;
+  	border-radius: 6px 0px 0px 6px;
+  	border: 2rpx solid lightgray;
+  	line-height: 64rpx;
+  	text-align: center;
+  	color: darkgray;
+  }
+  .tipyMBt{
+  	font-size: 28rpx;
+  	width: 33%;
+  	border: 2rpx solid lightgray;
+  	line-height: 64rpx;
+  	text-align: center;
+  	color: darkgray;
+  }
+  .tipyRBt{
+  	font-size: 28rpx;
+  	width: 33%;
+  	border-radius: 0px 6px 6px 0px;
+  	border: 2rpx solid lightgray;
+  	line-height: 64rpx;
+  	text-align: center;
+  	color: darkgray;
+  }
+  .item_content{
+  	background: white;
+  	width: 660rpx;
+	margin-bottom: 30rpx;
+	padding: 16rpx;
+	border-radius: 16rpx;
+  }
+  .item_list{
+  	padding-left: 40rpx;
+  	display: flex;
+  	flex-direction: row;
+  	justify-content: flex-start;
+  }
+  
+  .itemA_content{
+  	width: 150rpx;
+  	height: 220rpx;
+  	margin: 16rpx 0;
+  	padding: 14rpx;
+  	box-sizing: border-box;
+  	image{
+  		width: 130rpx;
+  		height:130rpx;
+  		background-color:whitesmoke;
+  		display: block;
+  	}
+  	
+  	.title{
+  		width: 100%;
+  		text-align: center;
+  		font-size: 24rpx;
+  		line-height: 30rpx;
+  		padding-top: 4rpx;
+  	}
+  }	
+  
+  .mainimage{
+  	width: 660rpx;
+  	height: 330rpx;
+  	display: block;
+  	border-radius: 16rpx;
+  	background-color:floralwhite;
+  	border: 1rpx solid lightgray;
+  }
+  .Dishes{
+  	width: 100%;
+  	text-align: left;
+  	color: darkgray;
+  	font-size: 26rpx;
+  }
+  .price{
+  	width: 100%;
+  	text-align: left;
+  	//line-height: 28rpx;
+  	color: black;
+  }
+  .titletext{
+  	padding-top: 8rpx;
+  	width: 100%;
+  	text-align: left;
+  }
+  .toptext{
+	font-size: 30rpx;
+  }
+  .motext{
+	padding-top: 4rpx;
+	padding-bottom: 4rpx;
+	font-size: 26rpx;
+	padding-left: 10rpx;
+	padding-right: 10rpx;
+	line-height: 30rpx;
+	border-radius: 15rpx;
+  }
+  
+  .notTextA{
+	  padding: 6rpx;
+	  border-radius: 6rpx;
+	  border: 1rpx solid rosybrown;
+	  color: rosybrown;
+	  margin-left: 6rpx;
+  }
+	  
+  
 </style>

msdYongHu/pages/index/mindex/mindex.vue

@@ -1,945 +0,0 @@
-<template>
-	<view class="drawer">
-		<mynavbar class="mynavbarV" :title="Btitle" :titledetl="Btitledetl" :interestBT="0" :mycartBT="1" v-on:Enavbarsel="navbarsel"></mynavbar>
-		<view :style="{marginTop: vMtop+'rpx'}">
-			<swiperImgs v-if="cuxiaoImge.length>0" style="margin-top: 20rpx;" width="750" height="380" :imageList="cuxiaoImge"></swiperImgs>
-			<listitemB ref="flList" v-on:Efenleixuanze="fenleixuanze"></listitemB>
-			<!-- <fenleiList ref="fwfenlei" v-on:Efwflxuanze="fwflxuanze"></fenleiList> -->
-			<listItemD v-on:Emendianxuanze="mendianxuanze" :mendianList="mendianList" :title="$t('index.remenct')"></listItemD>
-			<!-- <listItemC ref="flList" v-on:Efenleixuanze="fenleixuanze"></listItemC> -->
-			
-		</view>
-		<view class="contentColumnC" style="margin-top: 10rpx;">
-			<view class="contentInRowS" style="width: 92%;">
-				<view class="contentColumnC" @click="BtStatesl(-1)">
-					<text class="toptext" :style="BtState==-1?'color:#40AE36':'color:black'">附近美食</text>
-					<text class="motext" :style="BtState==-1?'background-color:#40AE36;color:white':'background-color:white;color:darkgray'">猜你喜欢</text>
-				</view>
-				<!-- <text style="height: 60rpx;width: 2rpx;background-color:darkgray;"></text> -->
-				<!-- <view class="contentColumnC" @click="BtStatesl(3)">
-					<text class="toptext" :style="BtState==3?'color:#40AE36':'color:black'">最快</text>
-					<text class="motext" :style="BtState==3?'background-color:#40AE36;color:white':'background-color:white;color:darkgray'">距离最近</text>
-				</view>
-				<text style="height: 60rpx;width: 2rpx;background-color: cadetblue;"></text>
-				<view class="contentColumnC" @click="BtStatesl(2)">
-					<text class="toptext" :style="BtState==2?'color:#40AE36':'color:black'">优惠</text>
-					<text class="motext" :style="BtState==2?'background-color:#40AE36;color:white':'background-color:white;color:darkgray'">折扣最低</text>
-				</view>
-				<text style="height: 60rpx;width: 2rpx;background-color: cadetblue;"></text>
-				<view class="contentColumnC" @click="BtStatesl(0)">
-					<text class="toptext" :style="BtState==0?'color:#40AE36':'color:black'">人气</text>
-					<text class="motext" :style="BtState==0?'background-color:#40AE36;color:white':'background-color:white;color:darkgray'">大家在买</text>
-				</view> -->
-			</view>
-			<!-- <view class="contentColumnC" style="margin-top: 16rpx;">
-				<view class="item_content" v-for="(item,index) in fjmendian" @click="mendianxuanze(item.id)">
-					<imageconver :isremen="true" :isyouhui="false" :youhuinote="''" class="mainimage" :imagSrc="item.image"></imageconver>
-					<view class="titletext textfontB3">
-						<text>{{item.posName}}</text>
-					</view>
-					<text class="Dishes">{{item.area}}</text>
-					<view class="price textfontB5">
-						<text>{{$t('index.manX')}} {{$formPr(item.posPrice)}}{{$t('locale.huobidw')}}</text>
-					</view>
-				</view>
-			</view> -->
-			<view class="contentColumnC" style="margin-top: 16rpx;">
-				<view class="item_content" v-for="(item,index) in fjmendian" @click="mendianxuanze(item.id)">
-					<view class="contentInRowS">
-						<netImage width="130" height="130" :mysrc="item.logo" mymode="scaleToFill"></netImage>
-						<view class="contentColumn" style="width:520rpx ;">
-							<text class="text2row" style="font-size: 30rpx;">{{item.posName}}</text>
-							<view class="contentInRowS">
-								<text style="font-size: 26rpx;color: brown;">{{item.pingf}}分</text>
-								<text style="font-size: 26rpx;color: green;">月售{{item.ddsl}}+</text>
-							</view>
-							<view class="contentInRowS">
-								<text style="font-size: 26rpx;color:dimgrey;">{{item.posPrice}}起送</text>
-								<text style="font-size: 26rpx;">距离{{item.juli}}Km</text>
-							</view>
-							<view class="contentInRowL">
-								<text class="notTextA" style="font-size: 28rpx;">新客优惠</text>
-								<text class="notTextA" style="font-size: 28rpx;">超好吃</text>
-							</view>
-						</view>
-					</view>
-					<view class="">
-						<scroll-view scroll-view  scroll-x="true" >
-							<view class="item_list">
-								<view v-for="(item1, index) in item.foodList">
-									<view class="itemA_content">
-										<netImage width="130" height="130" :mysrc="item1.image" mymode="scaleToFill"></netImage>
-										<view class="contentColumnC title">
-											<text class="text2row" >{{item1.name}}</text>
-											<text>{{item1.price}}</text>
-										</view>
-									</view>
-								</view>
-							</view>
-						</scroll-view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<popViewGG :tips="$t('user.xiazaijindu')" :show="show" :maskClosable="false" :isCancel="false">
-			<view class="words">
-				<text>{{$t('user.xiazaizhong')}} {{percentVal}}%</text>
-			</view>
-		</popViewGG>
-		<popViewGG :tips="$t('index.dizhixuanz')" :show="showaddrs" :maskClosable="true" :isCancel="true" :acttips="$t('index.qitadizhi')" @chooseCancel="chooseCancel" @ClickCancel="ClickCancel">
-			<view class="contentColumnC" style="width: 90%;margin-left: 5%;">
-				<view class="itemView" v-for="(item,index) in addrList" @click="addrselct(item)">
-					<text class="addrV textfontB5">{{item.address}}</text>
-				</view>
-			</view>
-		</popViewGG>
-		<uni-popup style="z-index: 999;" ref="popYsxy" type="center" :isMaskClick="false" :safeArea="true">
-			<ysxyView v-on:EagrResult="agrResult"></ysxyView>
-		</uni-popup>
-  </view>
-</template>
-
-<script>
-  import mynavbar from "@/pages/component/mynavbar/mynavbar.vue";
-  import listItemC from "@/pages/component/listItemC/listItemC.vue";
-  import listItemD from "@/pages/component/listItemD/listItemD.vue";
-  import listitemB from "@/pages/component/listitemB/listitemB.vue";
-  
- import api from "@/pages/api/api.js"
-  export default {
-	  components:{
-		  mynavbar,
-		  listItemC,
-		  listItemD,
-		  listitemB
-	  },
-    data() {
-      return {
-		cuxiaoImge:[],
-        systemLocale: '',
-        applicationLocale: '',
-		Btitle:'',
-		Btitledetl:'',
-		latitude:10.721347,
-		longitude:106.713463,
-		addrList:[],
-		open: false,
-		isActive: false,
-		goods:[],
-		mendianList:[],
-		readonly:true,
-		versionMSG:[],
-		appVersionCode:0,
-		updateUrl:'',
-		tishigx:true,
-		show:false,
-		showaddrs:false,
-		percentVal:'',
-		juli:0,
-		searchBrH:120,
-		vMtop:0,
-		BtState:-1,
-		fjmendian:[],
-		page:1
-      }
-    },
-    onLoad() {
-		//this.ringoffImCall();
-		var tempjuli=uni.getStorageSync('FuWujuli');
-		if(''==tempjuli||null==tempjuli||undefined==tempjuli){
-			this.juli=10;
-		}
-		else{
-			this.juli=tempjuli;
-		}
-		var info = uni.getSystemInfoSync();
-		//console.log(info);
-		this.appVersionCode=info.appVersionCode;
-		this.statusBarHeight=info.statusBarHeight*4+60;
-		this.vMtop=this.statusBarHeight+this.searchBrH;
-		
-		var yszche=uni.getStorageSync('yszche');
-		if(1!=yszche){
-		}
-		else{
-			var tempjuli=uni.getStorageSync('FuWujuli');
-			if(''==tempjuli||null==tempjuli||undefined==tempjuli){
-				this.juli=10;
-			}
-			else{
-				this.juli=tempjuli;
-			}
-			uni.setStorageSync("latitude",this.latitude);
-			uni.setStorageSync("longitude",this.longitude);
-			// this.gethostmendianlist(1);
-			this.MYgetLocation();
-		}
-    },
-	
-	onReady() {
-		var yszche=uni.getStorageSync('yszche');
-		if(1!=yszche){
-			this.$refs.popYsxy.open('center');
-			uni.hideTabBar();
-		}
-		else{
-		}
-		// this.$refs.fwfenlei.getfenleiList();
-	},
-	
-	onShow() {
-		var yszche=uni.getStorageSync('yszche');
-		if(1!=yszche){
-			return;
-		}
-		this.cuxiaoList();
-		var tempjuli=uni.getStorageSync('FuWujuli');
-		if(''==tempjuli||null==tempjuli||undefined==tempjuli){
-			this.juli=10;
-		}
-		else{
-			this.juli=tempjuli;
-		}
-		console.log('this.juli',this.juli)
-		this.chongxindenglu();
-		if(this.tishigx){
-			this.tishigx=false;
-		}
-		else{
-			this.gettempLocate();
-			this.$refs.flList.getmendianfenlei();
-			//this.$refs.fwfenlei.getfenleiList();
-		}
-	},
-	
-    methods: {
-		checkdingdan(){
-			//getApp().globalData.iosfl(1);
-		},
-		cuxiaoList(){
-			this.cuxiaoImge=['/static/background/lunbo1.png','/static/background/lunbo1.png','/static/background/lunbo1.png'];
-			return;
-			api('cuxiaoList',{
-				mdId:'',
-				price:''
-			},r=>{
-				//console.log('-----------',r)
-				if(r.data.code==200){
-					this.cuxiaoImge=[];
-					var objs = r.data.data;
-					for(var i=0;i<objs.length;i++){
-						var obj=objs[i];
-						if(obj.poster&&obj.poster.length>0){
-							this.cuxiaoImge.push(obj.poster);
-						}
-					}
-				}
-			},failc=>{
-				//console.log('getadvertis----',failc)
-			})
-		},
-		//获取自己最近收货地址
-		getzuijinaddress(latitude,longitude){
-			api('getzuijinaddress',{
-				latitude:latitude,
-				longitude:longitude
-			},res=>{
-				if(res.data.code!=200){
-					return;
-				}
-				this.addrList=res.data.data;
-				console.log('11113');
-			},failc=>{
-				//console.log('getadvertis----',failc)
-			})
-		},
-	//获取当前定位
-	 MYgetLocation(){
-		 console.log('MYgetLocation');
-		var that = this;
-	 	uni.getLocation({
-	 		type:"wgs84", //默认为 wgs84 返回 gps 坐标//谷歌地图使用 wgs84 坐标，其他地图使用 gcj02 坐标
-	 		geocode: "true",
-	 		isHighAccuracy: "true",
-	 		accuracy: "best", // 精度值为20m
-	 		success: function (res) {
-	 		  console.log("定位获取:", res);
-			  that.latitude=res.latitude;
-			  that.longitude=res.longitude;
-			  var latlon= that.latitude+','+that.longitude;
-			  // that.Btitle=latlon;
-			  uni.setStorageSync("latitude",that.latitude);
-			  uni.setStorageSync("longitude",that.longitude);
-			  // that.gethostmendianlist(1);
-			  that.getMeishidafjmd(0,1);
-			  that.getzuijinaddress(that.latitude,that.longitude);
-			  that.getAreaCode(latlon);
-	 		},
-			fail(err) {
-				console.log(err);
-				if(that.Btitledetl==''){
-					// uni.navigateTo({
-					// 	url:'/pages/UserCenter/map/map?state=0'
-					// })
-					// uni.navigateTo({
-					// 	url:'/pages/UserCenter/map/mapN?state=0'
-					// })
-					uni.showToast({
-					    title:that.$t('api.dingweishibai'),
-					    icon: 'none',
-					    duration: 3000
-					})
-				}
-			}
-	 	});
-	},
-	//获取地图选点返回
-	gettempLocate(){
-		var that =this;
-		try {//读取
-			var data = uni.getStorageSync("userAddrLocation");
-			if(''==data || undefined==data || null==data){
-				// that.gethostmendianlist(1);
-				that.getMeishidafjmd(0,1);
-				that.getzuijinaddress(that.latitude,that.longitude);
-				return;
-			}
-			else{
-				
-				that.latitude=data.latitude;
-				that.longitude=data.longitude;
-				uni.setStorageSync("latitude",that.latitude);
-				uni.setStorageSync("longitude",that.longitude);
-				that.Btitle=data.name;
-				that.Btitledetl=data.address;
-				// that.gethostmendianlist(1);
-				that.getMeishidafjmd(0,1);
-				uni.setStorageSync('userAddrLocation',"");
-				uni.setStorageSync('tempLocation','');
-				that.getzuijinaddress(that.latitude,that.longitude);
-				return;
-			}
-		} catch(e){//错误
-			return;
-		}
-	},
-	//获取附近地址
-	getAreaCode(latlng){
-		var userId = uni.getStorageSync('userId');
-		var that = this;
-		api('getAddr',{
-			latlng:latlng,
-			id:userId
-		},res=>{
-			//console.log('getAreaCode',res);
-			if(res.data.code!=200){
-				return;
-			}
-			this.Btitle=res.data.data.name;
-			this.Btitledetl=res.data.data.address;
-		},failc=>{
-			//console.log('getadvertis----',failc)
-		})
-		
-	},
-	dowithAddr(r,type){
-		console.log(r);
-		if(type==0){
-			if(r.result.pois.length>0){
-				this.Btitledetl=r.result.formatted_address;
-			}
-		}
-		else if(type==1){
-			if(r.results.length>0){
-				this.Btitledetl=r.results[1].vicinity;
-			}
-		}
-	},
-	//
-	navbarsel(item){
-		console.log('navbarsel')
-		if(item==1){
-			if(this.addrList.length>0){
-				this.showaddrs=true;
-			}
-			else{
-				uni.navigateTo({
-					url:'/pages/UserCenter/map/Chazhaodizhi'
-				})
-				// uni.navigateTo({
-				// 	url:'/pages/UserCenter/map/mapN?state=0'
-				// })
-			}
-		}
-		if(item==2){
-			uni.navigateTo({
-				url:'/pages/shanpinxungou/shangpin/shangpinList/shangpinList'
-			})
-		}
-	},
-	addrselct(item){
-		this.latitude=item.latitude;
-		this.longitude=item.longitude;
-		uni.setStorageSync("latitude",this.latitude);
-		uni.setStorageSync("longitude",this.longitude);
-		this.Btitle='';
-		this.Btitledetl=item.address;
-		// this.gethostmendianlist(1);
-		this.getMeishidafjmd(0,1);
-		this.showaddrs=false;
-	},
-	chooseCancel(){
-		this.showaddrs=false;
-	},
-	ClickCancel(){
-		this.showaddrs=false;
-		console.log('ClickCancel');
-		uni.navigateTo({
-			url:'/pages/UserCenter/map/Chazhaodizhi'
-		})
-		// uni.navigateTo({
-		// 	url:'/pages/UserCenter/map/mapN?state=0'
-		// })
-	},
-	
-	//获取附近热门门店
-	gethostmendianlist(type){//0按照评分查询，1按照热度查询，2按照新开店时间查询
-		console.log(this.longitude,this.latitude)
-		var that = this;
-		api('getPfStore',{
-			longitude:this.longitude,
-			latitude:this.latitude,
-			page:1,
-			juli:this.juli,
-			type:type
-		},res=>{
-			console.log('getPfStore-----',res);
-			if(res.data.code==200){
-				this.mendianList=res.data.data;
-			}
-		},failc=>{
-			uni.showToast({
-				title: that.$t('api.wangluoshibai'),
-				icon: 'none',
-				duration: 2500
-			})
-		})
-		this.BtStatesl(this.BtState);
-	},
-	
-	//获取附近门店
-	getmendianlist(latitude,longitude){
-	 var that = this;
-	 that.fjmendian=[];
-	 api('getmendianlist',{
-		longitude:longitude,
-		latitude:latitude,
-		page:1,
-		area:'',
-		sort:'',
-		juli:that.juli
-	 },res=>{
-		//console.log('11',res);
-		if(res.data.data.length>0){
-			that.fjmendian=res.data.data;
-		}
-		else{
-			console.log('数据空')
-		}
-	 },failc=>{
-		uni.showToast({
-			title: that.$t('api.wangluoshibai'),
-			icon: 'none',
-			duration: 2500
-		})
-	 })
-	 
-	},
-	
-	//美食达 获取附近门店
-	getMeishidafjmd(type,page){
-		var that = this;
-		
-		var language = uni.getStorageSync('language');
-		if(language=='yuenan'){
-			language='vi';
-		}
-		if(language=='zh-Hans'){
-			language='zh-CN';
-		}
-		if(language=='zh-Hant'){
-			language='zh-TW';
-		}
-		
-		api('getStoreList',{
-				longitude:this.longitude,
-				latitude:this.latitude,
-				page:page,
-				flId:type,
-				language:language
-		},res=>{
-				console.log('getMeishidafjmd:',res.data.data.records);
-				if(res.data.data.records.length>0){
-					if(page==1){
-						that.fjmendian=res.data.data.records;
-					}
-					else{
-						
-						var temp = that.fjmendian;
-						for(var i=0;i<res.data.data.records.length;i++){
-							temp.push(res.data.data.records[i]);
-						}
-						that.fjmendian=temp;
-					}
-					
-				}
-				else{
-					console.log('数据空')
-					if(that.page>1){
-						that.page=that.page-1;
-					}
-				}
-		},failc=>{
-				uni.showToast({
-					title: that.$t('api.wangluoshibai'),
-					icon: 'none',
-					duration: 2500
-				})
-		})
-	},
-	
-	 fenleixuanze(e){
-		 uni.navigateTo({
-		 	url:'/pages/shanpinxungou/shangjia/shangjia?id='+e+'&latitude='+this.latitude+'&longitude='+this.longitude
-		 })
-		 return;
-	 },
-	 fwflxuanze(e){
-		 // uni.navigateTo({
-		 // 	url:'/pages/imcall/audioPush?caller=0&&playUrl='
-		 // })
-		 // return;
-		 // var token = uni.getStorageSync("token");
-		 // console.log('2222',token)
-		 // if(token == '' || token == undefined || token == null){
-		 // 	uni.navigateTo({
-		 // 		url:'/pages/UserCenter/LoginView'
-		 // 	})
-		 // 	return;
-		 // }
-		 // uni.navigateTo({
-		 // 	url:'/pages/dache/DdcheshouyeN?type=3'
-		 // })
-		 // return;
-		 uni.navigateTo({
-		 	url:'/pages/index/fuwuleixingList?serverType='+e+'&latitude='+this.latitude+'&longitude='+this.longitude
-		 })
-		 return;
-	 },
-	 mendianxuanze(id){
-		 uni.navigateTo({
-		 	url:'/pages/shanpinxungou/shangjia/shangjiaView?id='+id+'&isShangjia=0'
-		 })
-	 },
-	 chongxindenglu(){
-	   var token = getApp().globalData.token;
-	   //console.log('chongxindenglu111',token);
-	   if(token == '' || token == undefined || token == null){
-	   	//console.log('chongxindenglu1112222');
-	   	return;
-	   }
-	   else{
-	   	//console.log('chongxindenglu111333');
-	   	this.gengxintoken(token);
-	   	return;
-	   }
-	 },
-	gengxintoken(token){
-	 	
-		api('refreshToken',{
-			token:getApp().globalData.token
-		},res=>{
-			if(res.data.code==200){
-				//console.log('refreshToken',res)
-				getApp().globalData.token = res.data.data;
-				uni.setStorageSync("token",res.data.data);
-				this.getCID();
-			}
-			else{
-				getApp().globalData.token = '';
-				uni.setStorageSync("token",'');
-				console.log('refreshToken',res)
-			}
-		},failc=>{
-			//console.log('getadvertis----',failc)
-		})
-	 },
-	 getCID(){
-		 var cid = uni.getStorageSync("cid");
-		 //console.log('客户端推送标识:',cid)
-		 if(cid==''||cid==null||cid==undefined){
-			 var that = this;
-			 uni.getPushClientId({
-			    success: (res) => {
-					console.log('客户端推送标识:',res.cid)
-					// uni.showToast({
-					// 	title:'客户端推送标识1:'+res.cid,
-					// 	icon: 'none',
-					// 	duration: 4000
-					// })
-					uni.setStorageSync("cid",res.cid);
-					that.updataUserMsg(res.cid);
-			     },
-			     fail(err) {
-					 uni.showToast({
-					 	title:'获取推送标识失败',
-					 	icon: 'none',
-					 	duration: 4000
-					 })
-			      console.log(err)
-			     }
-			 });
-		 }
-		 else{
-			 this.updataUserMsg(cid)
-		 }
-		 
-	 },
-	 updataUserMsg(cid){
-	 	api('updataUserMsg',{//159b0921b7ab3eb4f93a184d973b9fcb
-	 		"cid":cid,
-	 	},res=>{
-	 		console.log('updataUserMsg：',cid,res.data)
-	 	},failc=>{
-	 		//console.log('getadvertis----',failc)
-	 	})
-	 },
-	 //---------------------------------------------------
-	 agrResult(state){//隐私协议
-		 console.log(state);
-		 if(state==0){
-			if (plus.os.name.toLowerCase() === 'android') {
-				console.log('ios');
-				plus.runtime.quit();
-			}
-			else{
-				console.log('ios');
-				// const threadClass = plus.ios.importClass("NSThread");
-				// const mainThread = plus.ios.invoke(threadClass, "mainThread");
-				// plus.ios.invoke(mainThread, "exit");
-				 plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
-			}
-		 }
-		 if(state==1){
-			 uni.showTabBar(); 
-			 this.$refs.popYsxy.close();
-			 uni.setStorageSync('yszche',1);
-			 var yszche=uni.getStorageSync('yszche');
-			 console.log(yszche);
-			 this.MYgetLocation();
-			 this.$refs.flList.getmendianfenlei();
-		 }
-		 if(state==2){
-			uni.navigateTo({
-				url:'/pages/index/mindex/yinszhengc'
-			})	 
-		 }
-	 },
-	 ringoffImCall(){
-	 	api('ringoff',{
-	 	},res=>{
-	 		console.log(res)
-	 	},failc=>{
-	 		//console.log('getadvertis----',failc)
-	 	})
-	 },
-	 //-------------------------------------------------
-	 BtStatesl(index){//附近 好评  新店
-	 this.BtState=index;
-		if(index==-1||index==3){
-			this.getmendianlist(this.latitude,this.longitude);
-			return;
-		}
-		this.getPfStore(this.BtState);
-	 },
-	 //查询附近高评分门店等----------------------------------------------------------
-	 getPfStore(type){//0按照评分查询，1按照热度查询，2按照新开店时间查询
-		this.fjmendian=[];
-		var that = this;
-		api('getPfStore',{
-			longitude:this.longitude,
-			latitude:this.latitude,
-			page:1,
-			juli:this.juli,
-			type:type
-		},res=>{
-			//console.log('getPfStore-----',res);
-			if(res.data.code==200){
-				this.fjmendian=res.data.data;
-			}
-		},failc=>{
-			uni.showToast({
-				title: that.$t('api.wangluoshibai'),
-				icon: 'none',
-				duration: 2500
-			})
-		})
-	 },
-	 //自动更新
-	 getVersion(){
-	 	var info = uni.getSystemInfoSync();
-	 	console.log(info);
-	 	if(info.platform.toLowerCase() != 'android'){
-	 		return;
-	 	}
-	 	var appVersionCode = info.appVersionCode;
-	 	var that = this;
-		
-		api('getversion',{
-			platform:'0',
-			name:'CTE'
-		},res=>{
-			console.log(res);
-			if(res.data.data){
-				var versionMSG=res.data.data;
-				if(appVersionCode<versionMSG.version){
-					uni.showModal({
-						cancelText: that.$t('order.quxiao'), // 取消按钮的文字
-						confirmText: that.$t('index.shengji'), // 确认按钮的文字 
-					    title: that.$t('api.message'),
-					    content: that.$t('index.yiyouxinban'),
-					    success: function (res) {
-							if (res.confirm) { //这里是点击了确定以后
-								var updateUrl='http://backend.amazeway.com.cn/androidApk/CTE.apk';
-								that.gengxinApp(updateUrl);
-							} else { //这里是点击了取消以后
-							  console.log('用户点击取消')
-							}
-							
-					    }
-					})
-				}
-			}
-		},failc=>{
-			//console.log('getadvertis----',failc)
-		});
-		
-	 	
-	 },
-	 gengxinApp(url){
-	 	console.log(url);
-	 	var that = this;					
-	 	var dtask = plus.downloader.createDownload(
-	 		url,
-	 		{
-	 			method: "GET"
-	 		}, (d, status) => {
-	 			console.log(status,d);
-	 			if (status == 200) {
-	 				plus.runtime.install(d.filename)
-	 			} else {
-	 				plus.nativeUI.alert('fail！' + status)
-	 			}
-	 	});
-	 	dtask.start();
-	 	var prg = 0;//进度数字化
-	 	var show= plus.nativeUI.showWaiting("Loading...");
-	 	var percentVal;
-	 	dtask.addEventListener('statechanged',function(task,status){
-	 		//console.log(task);
-	 		switch(task.state){//根据下载状态调整其显示内容
-	 			case 1:
-	 				percentVal = "Loading……";
-	 				show.setTitle("Loading……");
-	 				break;
-	 			case 2:
-	 				percentVal = "Connected";
-	 				show.setTitle("Connected");
-	 				break;
-	 			case 3:
-	 				percentVal = parseInt((parseFloat(task.downloadedSize) / parseFloat(task.totalSize)) * 100);
-	 				show.setTitle("Loading：" + percentVal + "%");
-	 				break;
-	 			case 4:
-	 				plus.nativeUI.closeWaiting();
-	 				
-	 				break;
-	 		}
-	 	});
-	 },
-    },
-	/**
-	 * 上拉加载回调函数
-	 */
-	onReachBottom() {
-		console.log('onReachBottom')
-		this.page=this.page+1;
-		this.getMeishidafjmd(0,this.page);
-	},
-  }
-</script>
-
-<style scoped lang="scss">
-  .contentbg{  
-	  margin-top: 240rpx;
-  }
-	.mynavbarV{
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		z-index: 9998;
-		//background-color: #00A6FF;
-		background-image: url("/static/background/indextopB.png");
-		/* background-image: url("/static/images/wodetop.jpg"); */
-		background-size: cover;
-		background-position: center bottom;
-	}
-
-  .drawer{
-	  width: 100%;
-	  padding-bottom: 100rpx;
-	  position: absolute;
-	  background-color: whitesmoke;
-  }
-  .words{
-  	width: 100%;
-  	text-align: center;
-  	font-size: 30rpx;
-  	height: 80rpx;
-  	line-height: 80rpx;
-  }
-  .itemView{
-	background-color: white;
-	height: 80rpx;
-	width: 100%;
-  	margin: 10rpx;
-  	padding: 16rpx;
-  	display: flex;
-  	flex-direction: row;
-  	align-items: center;
-  	justify-content:flex-start;
-  	border-radius: 20rpx;
-  	box-shadow: 0rpx 0rpx 10rpx 0rpx darkgray;
-  }
-  .addrV{
-  	color: black;
-  	overflow: hidden;
-  	text-overflow: ellipsis;
-  	display: -webkit-box;
-  	-webkit-line-clamp: 2;
-  	-webkit-box-orient: vertical;
-  }
-  
-  .tipyLBt{
-  	font-size: 28rpx;
-  	width: 33%;
-  	border-radius: 6px 0px 0px 6px;
-  	border: 2rpx solid lightgray;
-  	line-height: 64rpx;
-  	text-align: center;
-  	color: darkgray;
-  }
-  .tipyMBt{
-  	font-size: 28rpx;
-  	width: 33%;
-  	border: 2rpx solid lightgray;
-  	line-height: 64rpx;
-  	text-align: center;
-  	color: darkgray;
-  }
-  .tipyRBt{
-  	font-size: 28rpx;
-  	width: 33%;
-  	border-radius: 0px 6px 6px 0px;
-  	border: 2rpx solid lightgray;
-  	line-height: 64rpx;
-  	text-align: center;
-  	color: darkgray;
-  }
-  .item_content{
-  	background: white;
-  	width: 660rpx;
-	margin-bottom: 30rpx;
-	padding: 16rpx;
-	border-radius: 16rpx;
-  }
-  .item_list{
-  	padding-left: 40rpx;
-  	display: flex;
-  	flex-direction: row;
-  	justify-content: flex-start;
-  }
-  
-  .itemA_content{
-  	width: 150rpx;
-  	height: 220rpx;
-  	margin: 16rpx 0;
-  	padding: 14rpx;
-  	box-sizing: border-box;
-  	image{
-  		width: 130rpx;
-  		height:130rpx;
-  		background-color:whitesmoke;
-  		display: block;
-  	}
-  	
-  	.title{
-  		width: 100%;
-  		text-align: center;
-  		font-size: 24rpx;
-  		line-height: 30rpx;
-  		padding-top: 4rpx;
-  	}
-  }	
-  
-  .mainimage{
-  	width: 660rpx;
-  	height: 330rpx;
-  	display: block;
-  	border-radius: 16rpx;
-  	background-color:floralwhite;
-  	border: 1rpx solid lightgray;
-  }
-  .Dishes{
-  	width: 100%;
-  	text-align: left;
-  	color: darkgray;
-  	font-size: 26rpx;
-  }
-  .price{
-  	width: 100%;
-  	text-align: left;
-  	//line-height: 28rpx;
-  	color: black;
-  }
-  .titletext{
-  	padding-top: 8rpx;
-  	width: 100%;
-  	text-align: left;
-  }
-  .toptext{
-	font-size: 30rpx;
-  }
-  .motext{
-	padding-top: 4rpx;
-	padding-bottom: 4rpx;
-	font-size: 26rpx;
-	padding-left: 10rpx;
-	padding-right: 10rpx;
-	line-height: 30rpx;
-	border-radius: 15rpx;
-  }
-  
-  .notTextA{
-	  padding: 6rpx;
-	  border-radius: 6rpx;
-	  border: 1rpx solid rosybrown;
-	  color: rosybrown;
-	  margin-left: 6rpx;
-  }
-	  
-  
-</style>
-

msdYongHu/pages/shanpinxungou/shangjia/shangjiaView.vue → msdYongHu/pages/shanpinxungou/shangjia/merchantdetail.vue

@@ -1,35 +1,32 @@
 <template>
-	<view style="background-color: whitesmoke;" @touchstart="rightF" @touchend="leftF">
+	<view style="background-color: whitesmoke;">
 		<customNav :shownav="true" :title="posName" titledetl=""></customNav>
 		<view style="width: 100%;height: 80rpx;background-color:  #40AE36;"></view>
 		<view class="nodetail">
-			<view class="contentInRowS" style="width: 100%;">
-				<netImage style="margin-left: 12rpx;margin-top: -20rpx;" width="160" height="160" bradius="80" :mysrc="mendianMs.logo" mymode="scaleToFill"></netImage>
-				<view class="contentColumn" style="width: 500rpx;margin-right: 20rpx;">
-					<text class="dianpuming">{{mendianMs.posName}}</text>
-					<text class="peisongsuoming">{{$t('index.manX')}} {{$formPr(mendianMs.posPrice)}} {{$t('locale.huobidw')}}</text>
-					<view class="contentInRowS">
-						<view class="contentColumnC" style="width: 24%;">
-							<image class="actimge" :src="shouchangIcon" mode="aspectFit" @click="shouchang"></image>
-							<text class="textfontS3">{{$t('index.shouchang')}}</text>
-						</view>
-						<view class="contentColumnC" style="width: 24%;">
-							<image class="actimge" src="/static/images/daipinglun@3x.png" mode="aspectFit" @click="pinglunList"></image>
-							<text class="textfontS3">{{$t('index.pinglun')}}</text>
-						</view>
-						<view class="contentColumnC" style="width: 24%;">
-							<image class="actimge" src="/static/images/gengduozx.png" mode="aspectFit" @click="gengduozx"></image>
-							<text class="textfontS3">{{$t('index.mendian')}}</text>
-						</view>
-						<view class="contentColumnC" style="width: 24%;">
-							<image class="actimge" src="/static/images/lianxikf.png" mode="aspectFit" @click="callPhone"></image>
-							<text class="textfontS3">{{$t('mend.kefudianhua')}}</text>
-						</view>
+			<view class="contentInRowS" style="width: 100%;" @click="gengduozx">
+				<netImage style="margin-left: 12rpx;margin-top: -20rpx;" width="140" height="140" bradius="70" :mysrc="mendianMs.logo" mymode="scaleToFill"></netImage>
+				<view class="contentColumn" style="width: 500rpx;margin-right: 20rpx;margin-top: 4rpx;">
+					<view class="contentColumn">
+						<text class="dianpuming">{{mendianMs.posName}}</text>
+						<text class="peisongsuoming">{{$t('index.manX')}} {{$formPr(mendianMs.posPrice)}} {{$t('locale.huobidw')}}</text>
+						<text v-if="mendianMs.state==1" style="margin-top: 10rpx;color: darkgreen;font-size: 28rpx;padding-right: 40rpx;">{{$t('mend.statedy')}}</text>
 					</view>
 				</view>
 			</view>
-			<view v-if="mendianMs.state==1" class="contentInRowR">
-				<text style="margin-top: 10rpx;color: darkgreen;font-size: 28rpx;padding-right: 40rpx;">{{$t('mend.statedy')}}</text>
+			<view class="contentInRowL" style="margin-left: 40rpx;margin-top: 10rpx;margin-right: 40rpx;">
+				<view class="contentColumnC" style="width: 24%;">
+					<image class="actimge" :src="shouchangIcon" mode="aspectFit" @click="shouchang"></image>
+					<text class="textfontS3">{{$t('index.shouchang')}}</text>
+				</view>
+				<view class="contentColumnC" style="width: 24%;">
+					<image class="actimge" src="/static/images/daipinglun@3x.png" mode="aspectFit" @click="pinglunList"></image>
+					<text class="textfontS3">{{$t('index.pinglun')}}</text>
+				</view>
+				
+				<view class="contentColumnC" style="width: 24%;">
+					<image class="actimge" src="/static/images/kefufuwu.png" mode="aspectFit" @click="callPhone"></image>
+					<text class="textfontS3">{{$t('mend.kefudianhua')}}</text>
+				</view>
 			</view>
 			<view style="height: 20rpx;"></view>
 		</view>
@@ -41,57 +38,55 @@
 			<swiperImgs style="margin-top: 20rpx;" width="750" height="400" :imageList="cuxiaoImge"></swiperImgs>
 		</view>
 		<view style="margin-top: 40rpx;" >
-			<view :class="[(isFixedTop[0]) ?cssName:'']" id="box" class="box">
-				<view class="contentInRowL" style="width: 90%;margin-left: 5%;margin-bottom: 20rpx;align-items: center;">
-					<view >
-						<text class="fenleiTitle" @click="popfenlei">{{$t('index.goodsfenlei')}}</text>
-					</view>
-					<image class="actimgezy" style="margin-left: 10rpx;" src="/static/images/zuoyouhd.png" mode="aspectFit"></image>
-					<view class="">
-						<swiper style="height: 60rpx;width: 450rpx;align-items: center;" display-multiple-items="2"  :indicator-dots="false" :autoplay="false" :current="current" :duration="500" @animationfinish="fenleiSel">
-							<swiper-item v-for="(item,index) in shangpinfenlei">
-								<view class="swiper-item text1row" >{{item.name}}</view>
-							</swiper-item>
-						</swiper>
-					</view>
-				</view>
-			</view>
-			<view v-if="shangpinfenlei.length>0" class="page-view contentColumnC">
-				<view class="contentInRowC">
-					<text class="textdop2"></text>
-					<text class="textdop1"></text>
-					<text class="text2row" style="margin-left: 10rpx;font-size: 30rpx;font-weight: bold;max-width: 600rpx;">{{shangpinfenlei[current].name}}</text>
-					<text class="textdop1"></text>
-					<text class="textdop2"></text>
-				</view>
-			</view>
-			<view class="page-view contentColumn">
-				<view class="item_list">
-					<view class="item_content" v-for="(item1, index1) in shangpinlist" :key="index1" >
-						<view v-if="item1.stackingUp==0" class="thumb-boxR contentColumnC">
-							<netImage class="goodimage" width="334" height="334" :mysrc="item1.image" mymode="scaleToFill"  v-on:Emyimageclick="shangpinsl(item1.id)"></netImage>
-							<view class="msText">
-								<text class="dianpuming" @click="shangpinsl(item1.id)">{{item1.name}}</text>
-								<view class="buyBT">
-									<text class="peisongsuoming detailtextV">{{item1.introduce}}</text>
-								</view>
-								<view v-if="shangpingoumaiS[current][index1]" class="buyBTSB">
-									<text class="peisongsuoming">{{$formPr(item1.price)}}{{$t('locale.huobidw')}}</text>
-									<view v-if="item1.stackingUp==0" class="rconten">
-										<image v-if="shangpingoumaiS[current][index1].shuliang>0" class="imageRJ" src="/static/meishi/jianh.png" mode="aspectFit" @click="jiangouwuche(index1)"></image>
-										<text v-if="shangpingoumaiS[current][index1].shuliang>0" class="textR">{{shangpingoumaiS[current][index1].shuliang}}</text>
-										<image class="imageR" src="/static/meishi/jiah.png" mode="aspectFit" @click="editSKU(index1)"></image>
-									</view>
-									<view v-if="item1.stackingUp==1" class="rconten">
-										<text class="textR">{{$t('mend.yixiajia')}}</text>
-									</view>
-								</view>
-							</view>
+			<view class="menuBox" :style="{height: statickH+'rpx'}">
+				<view class="menuContent" :style="{height: statickH-120+'rpx'}">
+					<scroll-view scroll-y="true" class="menuLeft">
+						<view class="menuType" @click="changeCurrent(index)" v-for="(item,index) in prdList"
+							:class="{currentMenu:currentIndex==index}">
+							<text class="text2row">{{item.name}}</text>
 						</view>
-					</view>
+						<view class="line" :style="{top:currentIndex*100 +'rpx'}"></view>
+						<view style="height: 120rpx;"></view>
+					</scroll-view>
+			 
+					<scroll-view :scroll-top="scrollTop" @scroll="scrollRight" class="menuRight" scroll-y="true">
+						<div class="menuDetailBox" v-for="(item,index) in prdList" :key="index">
+							<div class="title">{{item.name}}</div>
+							<div class="menu" v-for="(menu,index) in item.children" :key="index">
+								<div class="d2" @click="shangpinsl(menu.shangpin.id)">
+									<netImage style="margin-top: 10rpx;" width="180" height="180" :mysrc="menu.shangpin.image" mymode="scaleToFill"></netImage>
+								</div>
+								<div class="menuName" >
+									<view class="contentColumnS" style="height: 200rpx;">
+										<view class="contentColumn" style="width: 100%;" @click="shangpinsl(menu.shangpin.id)">
+											<text class="pdName text2row">{{menu.shangpin.name}}</text>
+											<text class="pdDetail text2row">{{menu.shangpin.introduce}}</text>
+										</view>
+										<view class="contentColumn" style="width: 100%;">
+											<!-- <view class="contentInRowL">
+												<text class="redktext">特价</text>
+												<text class="greedKtext" style="margin-left: 10rpx;">24H发货</text>
+											</view> -->
+											<view class="contentInRowS">
+												<view class="">
+													<text class="pricetext">{{menu.shangpin.price}}</text>
+													<text class="pricedw">{{$t("locale.huobidw")}}</text>
+													<text class="yuanjia">{{menu.shangpin.price}}{{$t("locale.huobidw")}}</text>
+												</view>
+												<image style="width: 50rpx;height: 50rpx;margin-bottom: 6rpx;" src="/static/meishi/BuyS@3x.png" mode="" @click="editSKU(menu)"></image>
+											</view>
+										</view>
+									</view>
+									
+								</div>
+							</div>
+						</div>
+						<view style="height: 120rpx;"></view>
+					</scroll-view>
+					
 				</view>
-				<view style="height: 260rpx;"></view>
 			</view>
+			
 		</view>
 		<view class="bottomfloatV">
 			<view class="buyBT">
@@ -102,21 +97,9 @@
 		</view>
 		
 		<popViewGG  :show="showpop" :showbotom="false" :maskClosable="true" :isCancel="true" @chooseCancel="chooseCancel">
-			<foodxuangou style="width:100%;max-height: 70vh" :food="spindexSP" v-on:Ejiagouwuche="jiagouwuche"></foodxuangou>
+			<pdPurchase style="width:100%;max-height: 70vh" :food="spindexSP" v-on:Ejiagouwuche="jiagouwuche"></pdPurchase>
 		</popViewGG>
-		<uni-popup style="z-index: 999;" ref="popfl" type="center" :isMaskClick="true" :safeArea="true">
-			<view class="contentColumnC" style="width:660upx;background-color:white;border-radius: 8rpx;">
-				<text class="fenleiTitle" style="margin-top: 16rpx;margin-bottom: 16rpx;">{{$t('index.goodsfenlei')}}</text>
-				<scroll-view scroll-y="true" style="max-height: 400rpx;">
-					<view>
-						<view class="" v-for="(item,index) in shangpinfenlei">
-							<view class="fenleiitem" @click="ppfenleisel(index)">{{item.name}}</view>
-						</view>
-					</view>
-				</scroll-view>
-				<view style="height: 20rpx;"></view>
-			</view>
-		</uni-popup>
+		
 	</view>
 </template>
 
@@ -125,10 +108,12 @@
 	export default {
 		data() {
 			return {
-				isFixedTop:[],
-				Topdistance:[],
-				cssName:'',
 				//------------------------------
+				newData:[],  // 拿到右侧所有的商品列表元素
+				scrollTop: 0,
+				currentIndex: 0,
+				prdList:[],
+				//-----========
 				cuxiaoImge:[],
 				id:1,
 				userid:0,
@@ -141,14 +126,8 @@
 				login:false,
 				showpop:false,
 				gouwuche:[],
-				scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
 				shangpinfenlei:[],
-				shangpinlist:[],
-				shangpingoumaiS:[],
-				current: 0, // 当前分类值
-				spindex:0,//当前分类商品操作INDEX
-				spindexSP:'',//当前分类商品操作INDEX对应商品
-				itemId: 0, // 栏目右边scroll-view用于滚动的id
+				spindexSP:'',//当前分类商品操作商品
 				gouwcheimg:'/static/meishi/BuyS@3x.png',
 				notext:this.$t('comp.weixgsp'),
 				goumaijine:0,
@@ -156,7 +135,8 @@
 				gwbTcolor:'black',
 				startX:0,
 				startY:0,
-				lang:'0',
+				lang:'3',
+				statickH:0,
 			}
 		},
 		onShow() {
@@ -165,7 +145,7 @@
 				this.isfirstShow=1;
 			}
 			else{
-				this.refleashdata();
+				this.refreshPurchase();
 			}
 			var that =this;
 			try {//读取
@@ -195,7 +175,7 @@
 				this.lang='3';
 			}
 			this.id=option.id;
-			this.refleashdata();
+			this.jiagouwuche();
 			uni.pageScrollTo({
 				scrollTop:0,
 				duration:0
@@ -203,86 +183,157 @@
 			
 			var info = uni.getSystemInfoSync();
 			var isAndroid = info.platform.toLowerCase() === 'android';
+			console.log(info);
 			if(isAndroid){
-				this.cssName='fixedTop';
+				this.statickH=info.screenHeight*2-140-60;
 			}
 			else{
-				this.cssName='fixedTopios';
+				this.statickH=info.screenHeight*2-180-60;
 			}
 		},
-		mounted() {
-			this.GetTop()
-		},
-		onPageScroll(e) {
-			const that = this
-			// console.log(e.scrollTop,JSON.stringify(this.Topdistance),JSON.stringify(this.isFixedTop))
-				for(let i = 0; i < this.Topdistance.length; i++){
-					if(e.scrollTop > this.Topdistance[i]-70){
-						// console.log('***************')
-						this.isFixedTop[i] = true
-						this.$set(this.isFixedTop,i,true)
-						this.isFixedTop[i] = true
-					}else{
-						// console.log('++++++++++')
-						this.isFixedTop[i] = false
-						this.$set(this.isFixedTop,i,false)
-						this.isFixedTop[i] = false
+		
+		
+		methods: {
+			
+			//----------------------------------
+			changeCurrent(index) {
+				this.currentIndex = index
+				this.scrollTop = this.newData[index-1]?.offsetHeight || 0
+			},
+			scrollRight(e) {
+				// console.log(e.detail.scrollTop,'scrollRight');
+				const query = uni.createSelectorQuery().in(this);
+				for (let i = 0; i < this.newData.length; i++) {
+					let el = this.newData[i]
+					if (e.detail.scrollTop < el.offsetHeight) {
+						this.currentIndex = i
+						return true
 					}
 				}
-		},
-		methods: {
-			GetTop(){
-				var _this=this
-				uni.getSystemInfo({
-					success:(resu)=>{	
-						//console.log('resu',JSON.stringify(resu))
-						const query = uni.createSelectorQuery().in(this)
-						query.selectAll('.box').boundingClientRect()
-						query.selectViewport().scrollOffset()
-						query.exec(function(res){
-							//console.log('res',JSON.stringify(res))
-							_this.arr(res[0])
-						})
-					},
-					fail:(res)=>{}
+			},
+			
+			getmendianshangpinFL(id){
+				api('getmendianshangpinFL',{
+					id:id,
+					language:this.lang
+				},res=>{
+					
+					this.shangpinfenlei=res.data.data;
+					console.log(this.shangpinfenlei)
+					this.initFenlei();
+				},failc=>{
+					uni.hideLoading();
+					//console.log('getadvertis----',failc)
 				})
-			}, 
-			arr(res){
-				for(let i = 0; i < res.length; i++){
-					this.Topdistance[i] = res[i].top
-					this.isFixedTop[i] = false
+			},
+			initFenlei(){
+				this.prdList=[];
+				if(this.shangpinfenlei&&this.shangpinfenlei.length>0){
+					for (var i = 0; i < this.shangpinfenlei.length; i++) {
+						var el = this.shangpinfenlei[i];
+						var temp = {
+							"id": el.id,
+							"index": i+1,
+							"name": el.name,
+							"children": [
+							]
+						}
+						this.prdList.push(temp);
+					}
 				}
-				//console.log('----',JSON.stringify(this.Topdistance))
+				this.initproduct();
 			},
-			//------------------------------------------------------------------------------
-			rightF(e){
-				//console.log('rightF',e)
-				this.startX=e.changedTouches[0].pageX;
-				this.startY=e.changedTouches[0].pageY;
+			initproduct(){
+				if(this.prdList.length==0){
+					uni.hideLoading();
+					return;
+				}
+				this.getmendianshangpinList(0);
+				
 			},
-			leftF(e){
-				//console.log('leftF',e)
-				var s,n;
-				s=e.changedTouches[0].pageX;
-				n=e.changedTouches[0].pageY;
+			getmendianshangpinList(index){
 				
-				var dx,dy;
-				dx=this.startX-s;
-				dy=Math.abs(this.startY-n);
+				var obj = this.prdList[index];
 				
-				if(Math.abs(dx)>100&&Math.abs(dx)>dy){
-					if(dx>0){
-						if(this.current<this.shangpinfenlei.length-1){
-							this.current=this.current+1;
-						}
+				api('getmendianshangpinList',{
+					id:obj.id,
+					language:this.lang
+				},r=>{
+					console.log(r);
+					this.prdList[index].children= this.dowithshangpinList(r.data.data);
+					if(index+1<this.prdList.length){
+						this.getmendianshangpinList(index+1);
 					}
 					else{
-						if(this.current>0){
-							this.current=this.current-1;
+						console.log(this.prdList);
+						this.initNewData();
+						uni.hideLoading();
+					}
+				},failc=>{
+					uni.hideLoading();
+					//console.log('getadvertis----',failc)
+				})
+			},
+			dowithshangpinList(shangpinlist){
+				var tempList = [];
+				if(shangpinlist){
+					for(var j=0;j<shangpinlist.length;j++){
+						var shuliang = this.tongbugouwuchexinxi(shangpinlist[j]);
+						var otherPrice = this.getotherPrice(shangpinlist[j].foodSku);
+						var tempSKU = this.gettempSKU(shangpinlist[j].foodSku);
+						var tempsp={
+							"shangpin":shangpinlist[j],
+							"sku":tempSKU,
+							"otherPrice":otherPrice,
+							"shuliang":shuliang
 						}
+						tempList.push(tempsp);
 					}
 				}
+				return tempList;
+			},
+			initNewData(){
+				const query = uni.createSelectorQuery().in(this);
+				query.selectAll('.menuDetailBox').boundingClientRect(data => {
+					console.log('所有分类项：', data);
+					this.newData = data.map((item, index) => {
+						function fgfg(total) {
+							let sum = 0
+							for (var i = 0; i <= total; i++) {
+								sum += data[i].height
+							}
+							return sum
+						}
+						item.offsetHeight = fgfg(index)
+						return item
+					})
+					
+				}).exec();
+			},
+			
+			refreshPurchase(){
+				if(this.prdList.length<=0){
+					return;
+				}
+				for(var j=0;j<this.prdList.length;j++){
+					var children = this.prdList[j].children;
+					var tempList = [];
+					for(var i=0;i<children.length;i++){
+						var obj = children[i];
+						var shuliang = this.tongbugouwuchexinxi(obj.shangpin);
+						var otherPrice = this.getotherPrice(obj.shangpin.foodSku);
+						var tempSKU = this.gettempSKU(obj.shangpin.foodSku);
+						obj.sku = tempSKU;
+						obj.otherPrice = otherPrice;
+						obj.shuliang = shuliang;
+						tempList.push(obj);
+					}
+					this.prdList[j].children = tempList;
+				}
 			},
+			
+			//------------------------------------------------------------------------------
+			
 			fanhui(){
 				uni.navigateBack();
 			},
@@ -340,13 +391,9 @@
 				uni.navigateTo({
 					url:'/pages/pinglun/pingLunList?mendid='+this.id
 				})
+				
 			},
-			fenleiSel(e){
-				console.log(e);
-				this.current=e.detail.current;
-				this.getmendianshangpinList(this.shangpinfenlei[this.current].id);
-				this.itemId=0;
-			},
+			
 			shangpinsl(id){
 				//选择商品
 				uni.navigateTo({
@@ -362,8 +409,9 @@
 					})
 					return;
 				}
+				//跳转购物车
 				uni.navigateTo({
-					url:'/pages/OrderList/buy/gouwuche'
+					url:'/pages/shanpinxungou/shangjia/shoppingCart'
 				})
 			},
 			gotojiesuan(){
@@ -396,18 +444,7 @@
 					url:'/pages/OrderList/buy/dingdanjiesuan'
 				})
 			},
-			//pop------------------------------------------
-			popfenlei(){
-				if(this.shangpinfenlei.length>0){
-					this.$refs.popfl.open('center');
-				}
-			},
-			ppfenleisel(index){
-				this.current=index;
-				this.$refs.popfl.close();
-				this.getmendianshangpinList(this.shangpinfenlei[this.current].id);
-				this.itemId=0;
-			},
+			
 			//------------------------------------
 			addcollect(){
 				if(!this.login){
@@ -442,7 +479,6 @@
 					id:id
 				},r=>{
 					console.log(r.data.data);
-					uni.hideLoading();
 					this.mendianMs=r.data.data;
 					this.userid=this.mendianMs.userId;
 					this.posName=this.mendianMs.posName;
@@ -461,65 +497,6 @@
 					//console.log('getadvertis----',failc)
 				})
 			},
-			getmendianshangpinFL(id){
-				uni.showLoading({
-					mask:true
-				})
-				api('getmendianshangpinFL',{
-					id:id,
-					language:this.lang
-				},res=>{
-					uni.hideLoading();
-					this.shangpinfenlei=res.data.data;
-					if(this.shangpinfenlei.length>0){
-						this.getmendianshangpinList(this.shangpinfenlei[0].id);
-					}
-				},failc=>{
-					uni.hideLoading();
-					//console.log('getadvertis----',failc)
-				})
-			},
-			
-			getmendianshangpinList(id){
-				uni.showLoading({
-					mask:true
-				})
-				console.log(this.lang)
-				api('getmendianshangpinList',{
-					id:id,
-					language:this.lang
-				},r=>{
-					console.log(r);
-					uni.hideLoading();
-					this.dowithshangpinList(r.data.data);
-					this.shangpinlist=r.data.data;
-				},failc=>{
-					uni.hideLoading();
-					//console.log('getadvertis----',failc)
-				})
-			},
-			dowithshangpinList(shangpinlist){
-				if(this.shangpingoumaiS.length==0){
-					for(var i=0;i<this.shangpinfenlei.length;i++){
-						this.shangpingoumaiS.push([]);
-					}
-				}
-				this.shangpingoumaiS[this.current]=[];
-				if(shangpinlist){
-					for(var j=0;j<shangpinlist.length;j++){
-						var shuliang = this.tongbugouwuchexinxi(shangpinlist[j]);
-						var otherPrice = this.getotherPrice(shangpinlist[j].foodSku);
-						var tempSKU = this.gettempSKU(shangpinlist[j].foodSku);
-						var tempsp={
-							"shangpin":shangpinlist[j],
-							"sku":tempSKU,
-							"otherPrice":otherPrice,
-							"shuliang":shuliang
-						}
-						this.shangpingoumaiS[this.current].push(tempsp);
-					}
-				}
-			},
 			cuxiaoList(){
 				api('cuxiaoList',{
 					mdId:this.id,
@@ -565,28 +542,8 @@
 				}
 				return tempshuliang;
 			},
-			refleashdata(){
-				var gwc = uni.getStorageSync('gouwuche');
-				if(''==gwc||null==gwc||undefined==gwc){
-					this.gouwuche=[];
-					this.tongjigouwuche();
-				}
-				else{
-					this.gouwuche = JSON.parse(gwc);
-					this.tongjigouwuche();
-				}
-				if(this.shangpinlist.length>0){
-					this.dowithshangpinList(this.shangpinlist);
-				}
-			},
-			jiangouwuche(e){
-				//跳转购物车
-				uni.switchTab({
-					url:'/pages/OrderList/buy/gouwuche'
-				})
-			},
 			
-			jiagouwuche(e){
+			jiagouwuche(){
 				var gwc = uni.getStorageSync('gouwuche');
 				if(''==gwc||null==gwc||undefined==gwc){
 					this.gouwuche=[];
@@ -594,15 +551,9 @@
 				else{
 					this.gouwuche = JSON.parse(gwc);
 				}
-				this.dowithshangpinList(this.shangpinlist);
+				this.refreshPurchase();
 				
 				this.tongjigouwuche();
-				var temp=[];
-				for (var i=0;i<this.shangpinlist.length;i++) {
-					temp.push(this.shangpinlist[i]);
-				}
-				this.shangpinlist=temp;
-				
 				this.showpop=false;
 				
 			},
@@ -623,13 +574,11 @@
 					this.showbt=false;
 				}
 			},
-			editSKU(index){
-				this.spindex=index;
-				var sp = this.shangpingoumaiS[this.current][index];
-				//this.skuGuige=sp.shangpin.sku;
+			editSKU(sp){
+				console.log(sp);
 				this.spindexSP = sp;
 				this.showpop=true;
-				console.log('<<<<<<',this.shangpinlist[index]);
+				
 				//this.$refs.popup.open();
 			},
 			gettempSKU(foodSku){
@@ -706,69 +655,12 @@
 		background-color: white;
 		border: 1rpx solid darkgray;
 	}
-	.swiper-item {
-	  flex: 1;
-	  flex-direction:row;
-	  padding-left: 30rpx;
-	  font-size: 28rpx;
-	  line-height: 60rpx;
-	  text-align: left;
-	}
-	.textdop1{
-		width: 12rpx;
-		height: 12rpx;
-		background-color: #00A6FF;
-		border-radius: 6rpx;
-		margin-left: 10rpx;
-	}
-	.textdop2{
-		width: 8rpx;
-		height: 8rpx;
-		background-color: #00A6FF;
-		border-radius: 4rpx;
-		margin-left: 10rpx;
-	}
+
+
 	.page-view {
 		background-color:#F2F3F7;
 	}
 	
-	.item_list{
-		padding: 0 15rpx;
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: flex-start;
-		.item_content{
-			width: 50%;
-			margin: 10rpx 0;
-			padding: 14rpx;
-			box-sizing: border-box;
-		}
-	}
-
-	.thumb-boxR {
-	    width: 334rpx;
-		background-color: white;
-	}
-	.goodimage{
-		margin-top: 0rpx;
-	}
-	
-	.detailtextV{
-		width: 90%;
-		height: 80rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		-webkit-box-orient: vertical;
-	}
-	.rconten{
-		display:flex;
-		flex-direction: row;
-		align-items: center;
-		margin-left: auto;
-		justify-content: flex-end;
-	}
 	.actimgeCT{
 		position: fixed;
 		width: 94%;
@@ -780,32 +672,10 @@
 		width: 60rpx;
 		height: 60rpx;
 	}
-	.actimgezy{
-		width: 40rpx;
-		height: 40rpx;
-	}
-	.imageRJ{
-		width: 56rpx;
-		height: 56rpx;
-		margin-right: 8rpx;
-	}
-	.imageR{
-		width: 56rpx;
-		height: 56rpx;
-		margin-right: 30rpx;
-	}
-	.textR{
-		margin-left: 6rpx;
-		margin-right: 6rpx;
-	}
-	.msText{
-		width: 90%;
-		margin-top: 20rpx;
-		padding-left: 30rpx;
-		text-align: left;
-		font-size: 22rpx;
-		line-height: 32rpx;
-	}
+
+
+
+
 	.buyBT{
 		display:flex;
 		flex-direction: row;
@@ -871,4 +741,135 @@
 		border: solid lavender;
 		border-width: 0px 0px 1rpx 0px;
 	}
-</style>
+	//-----------------------------
+	.menuBox {
+		// height: calc(100vh);
+		display: flex;
+		flex-direction: column;
+		// border: 1px solid #ccc;
+		margin: 0 10rpx;
+		.menuContent {
+			height: 100%;
+			overflow: auto;
+			position: relative;
+			display: flex;
+			position: sticky;
+			top: 0rpx;
+			.menuLeft {
+				float: left;
+				position: relative;
+				width: 200rpx;
+				background-color: #f5f5f5;
+	 
+				.menuType {
+					transition: all 0.4s;
+					position: relative;
+					z-index: 999999999;
+					height: 100rpx;
+					display: flex;
+					align-items: center;
+					padding-left: 20rpx;
+	 
+					&.currentMenu {
+						font-weight: 700;
+					}
+				}
+	 
+			}
+	 
+			.menuRight {
+				flex: 1;
+				background-color:lavender;
+	 
+				.menuDetailBox {
+					.title {
+						height: 60rpx;
+						display: flex;
+						align-items: center;
+					}
+	 
+					.menu {
+						background-color: #fff;
+						height: 200rpx;
+						display: flex;
+						justify-content: center;
+	 
+						&:not(:nth-last-of-type(1)) {
+							margin-bottom: 20rpx;
+						}
+	 
+						.d2 {
+							width: 180rpx;
+							height: 180rpx;
+						}
+	 
+						.menuName {
+							flex: 1;
+							margin-left: 20rpx;
+						}
+	 
+					}
+				}
+			}
+		}
+	}
+	 
+	.line {
+		position: absolute;
+		left: 0;
+		top: 0;
+		height: 100rpx;
+		width: 100%;
+		background-color: #fff;
+		z-index: 999;
+		transition: all 0.4s;
+	 
+		&::before {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 0;
+			height: 100rpx;
+			width: 4rpx;
+			background-color: red;
+			z-index: 999;
+			transition: all 0.4s
+		}
+	}
+	
+	.pdName{
+		font-size: 30rpx;
+		font-weight: bold;
+		color: black;
+	}
+	.pdDetail{
+		font-size: 26rpx;
+		color: darkgray;
+	}
+	.redktext{
+		color: brown;
+		border-radius: 4rpx;
+		border: 1px solid brown;
+		font-size: 26rpx;
+	}
+	.greedKtext{
+		color: darkgreen;
+		border-radius: 4rpx;
+		border: 1px solid darkgreen;
+		font-size: 26rpx;
+	}
+	.pricetext{
+		color: firebrick;
+		font-size: 28rpx;
+		font-weight: bold;
+	}
+	.pricedw{
+		font-size: 24rpx;
+		color: darkgray;
+	}
+	.yuanjia{
+		font-size: 24rpx;
+		color: darkgray;
+		text-decoration: line-through;
+	}
+</style>

msdYongHu/pages/shanpinxungou/shangjia/productlist.vue

@@ -0,0 +1,550 @@
+<template>
+ 
+	<view class="menuBox">
+		<view class="menuContent">
+			<scroll-view scroll-y="true" class="menuLeft">
+				<view class="menuType" @click="changeCurrent(index)" v-for="(item,index) in prdList"
+					:class="{currentMenu:currentIndex==index}">
+					<text class="text2row">{{item.name}}</text>
+				</view>
+				<view class="line" :style="{top:currentIndex*100 +'rpx'}"></view>
+			</scroll-view>
+ 
+			<scroll-view :scroll-top="scrollTop" @scroll="scrollRight" class="menuRight" scroll-y="true">
+				<div class="menuDetailBox" v-for="(item,index) in prdList" :key="index">
+					<div class="title">{{item.name}}</div>
+					<div class="menu" v-for="(menu,index) in item.children" :key="index">
+						<div class="d2">
+							<netImage style="margin-top: 10rpx;" width="180" height="180" :mysrc="menu.image" mymode="scaleToFill"></netImage>
+						</div>
+						<div class="menuName">
+							<view class="contentColumnS" style="height: 200rpx;">
+								<view class="contentColumn" style="width: 100%;">
+									<text class="pdName text2row">{{menu.name}}</text>
+									<text class="pdDetail text1row">{{menu.name}}</text>
+								</view>
+								<view class="contentColumn" style="width: 100%;">
+									<view class="contentInRowL">
+										<text class="redktext">特价</text>
+										<text class="greedKtext" style="margin-left: 10rpx;">24H发货</text>
+									</view>
+									<view class="contentInRowS">
+										<view class="">
+											<text class="pricetext">123.32</text>
+											<text class="pricedw">{{$t("locale.huobidw")}}</text>
+											<text class="yuanjia">155.32{{$t("locale.huobidw")}}</text>
+										</view>
+										<image style="width: 50rpx;height: 50rpx;margin-bottom: 6rpx;" src="/static/meishi/BuyS.png" mode=""></image>
+									</view>
+								</view>
+							</view>
+							
+						</div>
+					</div>
+				</div>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+ 
+<script>
+	import api from "@/pages/api/api.js";
+	export default {
+		data() {
+			return {
+				newData:[],  // 拿到右侧所有的商品列表元素
+				scrollTop: 0,
+				currentIndex: 0,
+				lang:'3',
+				id:'',
+				shangpinfenlei:[],
+				prdList:[],
+				menuList: [{
+						"id": 1,
+						"name": "手机数码",
+						"children": [{
+								"id": 101,
+								"name": "手机"
+							},
+							{
+								"id": 105,
+								"name": "数码相机"
+							}
+						]
+					},
+					{
+						"id": 2,
+						"name": "家用电器",
+						"children": [{
+								"id": 201,
+								"name": "电视机"
+							},
+							{
+								"id": 204,
+								"name": "冰箱"
+							},
+							{
+								"id": 205,
+								"name": "吸尘器"
+							}
+						]
+					},
+					{
+						"id": 3,
+						"name": "服饰鞋包",
+						"children": [{
+								"id": 301,
+								"name": "男装"
+							},
+							{
+								"id": 302,
+								"name": "女装"
+							},
+							{
+								"id": 303,
+								"name": "运动鞋"
+							},
+							{
+								"id": 304,
+								"name": "箱包"
+							},
+							{
+								"id": 305,
+								"name": "配饰"
+							}
+						]
+					},
+					{
+						"id": 4,
+						"name": "美妆个护",
+						"children": [{
+								"id": 401,
+								"name": "面部护肤"
+							},
+							{
+								"id": 402,
+								"name": "彩妆"
+							},
+							{
+								"id": 403,
+								"name": "洗发护发"
+							},
+							{
+								"id": 404,
+								"name": "身体护理"
+							},
+							{
+								"id": 405,
+								"name": "香水"
+							}
+						]
+					},
+					{
+						"id": 5,
+						"name": "母婴玩具",
+						"children": [{
+								"id": 501,
+								"name": "奶粉"
+							},
+							{
+								"id": 502,
+								"name": "尿不湿"
+							},
+							{
+								"id": 503,
+								"name": "婴儿用品"
+							},
+							{
+								"id": 504,
+								"name": "儿童玩具"
+							},
+							{
+								"id": 505,
+								"name": "孕妇用品"
+							}
+						]
+					},
+					{
+						"id": 6,
+						"name": "食品饮料",
+						"children": [{
+								"id": 601,
+								"name": "休闲零食"
+							},
+							{
+								"id": 602,
+								"name": "粮油调味"
+							},
+							{
+								"id": 603,
+								"name": "饮料酒水"
+							},
+							{
+								"id": 604,
+								"name": "冲调速食"
+							},
+							{
+								"id": 605,
+								"name": "生鲜水果"
+							}
+						]
+					},
+					{
+						"id": 7,
+						"name": "家居家装",
+						"children": [{
+								"id": 701,
+								"name": "家具"
+							},
+							{
+								"id": 702,
+								"name": "灯具"
+							},
+							{
+								"id": 703,
+								"name": "床上用品"
+							},
+							{
+								"id": 704,
+								"name": "厨房用品"
+							},
+							{
+								"id": 705,
+								"name": "装饰摆件"
+							}
+						]
+					},
+					{
+						"id": 8,
+						"name": "运动户外",
+						"children": [{
+								"id": 801,
+								"name": "跑步装备"
+							},
+							{
+								"id": 802,
+								"name": "健身器材"
+							},
+							{
+								"id": 803,
+								"name": "户外鞋服"
+							},
+							{
+								"id": 804,
+								"name": "骑行装备"
+							},
+							{
+								"id": 805,
+								"name": "垂钓用品"
+							}
+						]
+					},
+					{
+						"id": 9,
+						"name": "汽车用品",
+						"children": [{
+								"id": 901,
+								"name": "机油"
+							},
+							{
+								"id": 902,
+								"name": "轮胎"
+							},
+							{
+								"id": 903,
+								"name": "车载电器"
+							},
+							{
+								"id": 904,
+								"name": "清洁用品"
+							},
+							{
+								"id": 905,
+								"name": "维修配件"
+							}
+						]
+					},
+					{
+						"id": 10,
+						"name": "图书文娱",
+						"children": [{
+								"id": 1001,
+								"name": "文学小说"
+							},
+							{
+								"id": 1002,
+								"name": "少儿读物"
+							},
+							{
+								"id": 1003,
+								"name": "教育考试"
+							},
+							{
+								"id": 1004,
+								"name": "艺术设计"
+							},
+							{
+								"id": 1005,
+								"name": "音像制品"
+							}
+						]
+					}
+				]
+ 
+			}
+		},
+		onLoad(option) {
+			this.id=option.id;
+			var language = uni.getStorageSync('language');
+			if(language=='yuenan'){
+				this.lang='0';
+			}
+			if(language=='zh-Hans'){
+				this.lang='2';
+			}
+			if(language=='zh-Hant'){
+				this.lang='3';
+			}
+			this.getmendianshangpinFL(this.id);
+		},
+		onReady() {
+			uni.setNavigationBarTitle({
+				title: '你好'
+			})
+			
+		},
+		methods: {
+			changeCurrent(index) {
+				this.currentIndex = index
+				this.scrollTop = this.newData[index-1]?.offsetHeight || 0
+			},
+			scrollRight(e) {
+				// console.log(e.detail.scrollTop,'scrollRight');
+				const query = uni.createSelectorQuery().in(this);
+				for (let i = 0; i < this.newData.length; i++) {
+					let el = this.newData[i]
+					if (e.detail.scrollTop < el.offsetHeight) {
+						this.currentIndex = i
+						return true
+					}
+				}
+			},
+			getmendianshangpinFL(id){
+				uni.showLoading({
+					mask:true
+				})
+				api('getmendianshangpinFL',{
+					id:id,
+					language:this.lang
+				},res=>{
+					uni.hideLoading();
+					this.shangpinfenlei=res.data.data;
+					console.log(this.shangpinfenlei)
+					this.initFenlei();
+				},failc=>{
+					uni.hideLoading();
+					//console.log('getadvertis----',failc)
+				})
+			},
+			initFenlei(){
+				this.prdList=[];
+				if(this.shangpinfenlei&&this.shangpinfenlei.length>0){
+					for (var i = 0; i < this.shangpinfenlei.length; i++) {
+						var el = this.shangpinfenlei[i];
+						var temp = {
+							"id": el.id,
+							"index": i+1,
+							"name": el.name,
+							"children": [
+							]
+						}
+						this.prdList.push(temp);
+					}
+				}
+				this.initproduct();
+			},
+			initproduct(){
+				if(this.prdList.length==0){
+					return;
+				}
+				this.getmendianshangpinList(0);
+				
+			},
+			getmendianshangpinList(index){
+				
+				var obj = this.prdList[index];
+				
+				api('getmendianshangpinList',{
+					id:obj.id,
+					language:this.lang
+				},r=>{
+					console.log(r);
+					this.prdList[index].children=r.data.data;
+					if(index+1<this.prdList.length){
+						this.getmendianshangpinList(index+1);
+					}
+					else{
+						console.log(this.prdList);
+						this.initNewData();
+					}
+				},failc=>{
+					
+					//console.log('getadvertis----',failc)
+				})
+			},
+			initNewData(){
+				const query = uni.createSelectorQuery().in(this);
+				query.selectAll('.menuDetailBox').boundingClientRect(data => {
+					console.log('所有分类项：', data);
+					this.newData = data.map((item, index) => {
+						function fgfg(total) {
+							let sum = 0
+							for (var i = 0; i <= total; i++) {
+								sum += data[i].height
+							}
+							return sum
+						}
+						item.offsetHeight = fgfg(index)
+						return item
+					})
+					
+				}).exec();
+			},
+		},
+		
+	}
+</script>
+ 
+<style lang="scss" scoped>
+	.menuBox {
+		height: calc(100vh);
+		display: flex;
+		flex-direction: column;
+		// border: 1px solid #ccc;
+		margin: 0 10rpx;
+		.menuContent {
+			// height: calc(100vh);
+			overflow: auto;
+			position: relative;
+			display: flex;
+			position: sticky;
+			top: 0rpx;
+			.menuLeft {
+				float: left;
+				position: relative;
+				width: 200rpx;
+				background-color: #f5f5f5;
+ 
+				.menuType {
+					transition: all 0.4s;
+					position: relative;
+					z-index: 999999999;
+					height: 100rpx;
+					display: flex;
+					align-items: center;
+					padding-left: 20rpx;
+ 
+					&.currentMenu {
+						font-weight: 700;
+					}
+				}
+ 
+			}
+ 
+			.menuRight {
+				flex: 1;
+				background-color:lavender;
+ 
+				.menuDetailBox {
+					.title {
+						height: 60rpx;
+						display: flex;
+						align-items: center;
+					}
+ 
+					.menu {
+						background-color: #fff;
+						height: 200rpx;
+						display: flex;
+						justify-content: center;
+ 
+						&:not(:nth-last-of-type(1)) {
+							margin-bottom: 20rpx;
+						}
+ 
+						.d2 {
+							width: 180rpx;
+							height: 180rpx;
+						}
+ 
+						.menuName {
+							flex: 1;
+							margin-left: 20rpx;
+						}
+ 
+					}
+				}
+			}
+		}
+	}
+ 
+	.line {
+		position: absolute;
+		left: 0;
+		top: 0;
+		height: 100rpx;
+		width: 100%;
+		background-color: #fff;
+		z-index: 999;
+		transition: all 0.4s;
+ 
+		&::before {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 0;
+			height: 100rpx;
+			width: 4rpx;
+			background-color: red;
+			z-index: 999;
+			transition: all 0.4s
+		}
+	}
+	
+	.pdName{
+		font-size: 30rpx;
+		font-weight: bold;
+		color: black;
+	}
+	.pdDetail{
+		font-size: 26rpx;
+		color: darkgray;
+	}
+	.redktext{
+		color: brown;
+		border-radius: 4rpx;
+		border: 1px solid brown;
+		font-size: 26rpx;
+	}
+	.greedKtext{
+		color: darkgreen;
+		border-radius: 4rpx;
+		border: 1px solid darkgreen;
+		font-size: 26rpx;
+	}
+	.pricetext{
+		color: firebrick;
+		font-size: 28rpx;
+		font-weight: bold;
+	}
+	.pricedw{
+		font-size: 24rpx;
+		color: darkgray;
+	}
+	.yuanjia{
+		font-size: 24rpx;
+		color: darkgray;
+		text-decoration: line-through;
+	}
+	
+</style>

msdYongHu/pages/shanpinxungou/shangjia/shangjia.vue

@@ -1,49 +1,43 @@
 <template>
-	<!--
-	本页面模板教程：https://ext.dcloud.net.cn/plugin?id=2672
-	uni-list 文档：https://ext.dcloud.net.cn/plugin?id=24
-	uniCloud 文档：https://uniapp.dcloud.io/uniCloud/README
-	unicloud-db 组件文档：https://uniapp.dcloud.io/uniCloud/unicloud-db
-	DB Schema 规范：https://uniapp.dcloud.net.cn/uniCloud/schema
-	 -->
-	<view class="list">
+	<view class="contentV">
 		<customNav :shownav="true" :title="$t('index.mendianliebiao')" titledetl=""></customNav>
-		<!-- 刷新页面后的顶部提示框 -->
-		<!-- 当前弹出内容没有实际逻辑 ，可根据当前业务修改弹出提示 -->
-		<view class="tips" :class="{ 'tips-ani': tipShow }">{{$t('index.liebiaogengxin')}}</view>
-		<!--
-		<unicloud-db ref="udb" v-slot:default="{data, loading, error, options}" :options="formData" :collection="collection"
-		 :field="field" @load="load">
-		 -->
-			<!-- 基于 uni-list 的页面布局 -->
-			<uni-list>
-				<!-- to 属性携带参数跳转详情页面，当前只为参考 -->
-				<uni-list-item :border="false" class="uni-list-item--waterfall"  v-for="(item,index) in mendianList" :key="index" v-on:click="gotoDetail(item.id)" :clickable="clickable">
-					<view slot="body" class="shop">
-						<view class="item_content">
-							<imageconver :isremen="true" :isyouhui="false" :youhuinote="''" class="mainimage" :imagSrc="item.image"></imageconver>
-							<!-- <image class="mainimage" :src="item.image=='/static/defimages/ddd.png'?item.image:baseUrl+item.image" mode="scaleToFill" @error="imageError(index)"></image> -->
-							<view class="buyBTact">
-								<text class="title">{{item.posName}}</text>
-								<!-- <view class="viewinrow">
-									<image class="xingxing" src="/static/images/xingxing@3x.png" mode="widthFix"></image>
-									<text class="pingfentext">4.5</text>
-								</view> -->
-							</view>
-							<view class="">
-								<text class="Dishes">{{item.area}}</text>
-							</view>
-							<view class="viewinrow">
-								<image class="xingxing" src="/static/images/paotui@3x.png" mode="widthFix"></image>
-								<text class="price">{{$formPr(item.posPrice)}}{{$t('locale.huobidw')}}</text>
-							</view>
+		<view class="contentColumnC" style="margin-top: 16rpx;">
+			<view class="item_content" v-for="(item,index) in mendianList" @click="gotoDetail(item.id)">
+				<view class="contentInRowS">
+					<netImage width="130" height="130" :mysrc="item.logo" mymode="scaleToFill"></netImage>
+					<view class="contentColumn" style="width:520rpx ;">
+						<text class="text2row" style="font-size: 30rpx;">{{item.posName}}</text>
+						<view class="contentInRowS">
+							<text style="font-size: 26rpx;color: brown;">{{item.pingf}}分</text>
+							<text style="font-size: 26rpx;color: green;">月售{{item.ddsl}}+</text>
+						</view>
+						<view class="contentInRowS">
+							<text style="font-size: 26rpx;color:dimgrey;">{{item.posPrice}}起送</text>
+							<text style="font-size: 26rpx;">距离{{item.juli}}Km</text>
+						</view>
+						<view class="contentInRowL">
+							<text class="notTextA" style="font-size: 28rpx;">新客优惠</text>
+							<text class="notTextA" style="font-size: 28rpx;">超好吃</text>
 						</view>
 					</view>
-				</uni-list-item>
-			</uni-list>
-			<!-- 通过 loadMore 组件实现上拉加载效果，如需自定义显示内容，可参考：https://ext.dcloud.net.cn/plugin?id=29 -->
-			<uni-load-more v-if="loading || status === 'noMore' " :status="status" />
-		<!--</unicloud-db>-->
+				</view>
+				<view class="">
+					<scroll-view scroll-view  scroll-x="true" >
+						<view class="item_list">
+							<view v-for="(item1, index) in item.foodList">
+								<view class="itemA_content">
+									<netImage width="130" height="130" :mysrc="item1.image" mymode="scaleToFill"></netImage>
+									<view class="contentColumnC title">
+										<text class="text2row" >{{item1.name}}</text>
+										<text>{{item1.price}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -63,7 +57,7 @@
 				},
 				tipShow: false ,// 是否显示顶部提示框
 				data:'',
-				mendianList:{},
+				mendianList:[],
 				status:'more',
 				loading:true,
 				latitude:0,
@@ -110,20 +104,20 @@
 			gotoDetail(e){
 				console.log(e);
 				uni.navigateTo({
-					url:'/pages/shanpinxungou/shangjia/shangjiaView?id='+e
+					url:'/pages/shanpinxungou/shangjia/merchantdetail?id='+e
 				})
 			},
 			getmendianlist(page){
 				this.tipShow = true;
 				var data;
+				var language='zh-TW';
 				if(null==this.typeID||undefined==this.typeID||''==this.typeID){
 					data= {
 						longitude:this.longitude,
 						latitude:this.latitude,
 						page:page,
-						area:'',
-						sort:'',
-						juli:this.juli
+						flId:0,
+						language:language
 					}
 				}
 				else{
@@ -131,21 +125,20 @@
 						longitude:this.longitude,
 						latitude:this.latitude,
 						page:page,
-						area:'',
-						sort:this.typeID,
-						juli:this.juli
+						flId:this.typeID,
+						language:language
 					}
 				}
 				//console.log(data)
-				api('getmendianlist',data,
+				api('getStoreList',data,
 				r=>{
 					console.log(r.data.data);
 					if(this.page==1){
-						this.mendianList=r.data.data;
+						this.mendianList=r.data.data.records;
 					}
 					else{
-						if(r.data.data&&r.data.data.length>0){
-							this.mendianList=this.mendianList.concat(r.data.data)
+						if(r.data.data&&r.data.data.records.length>0){
+							this.mendianList=this.mendianList.concat(r.data.data.records)
 						}
 						else{
 							this.status = 'noMore';
@@ -217,7 +210,7 @@
 </script>
 
 <style lang="scss">
-	@import '@/common/uni-ui.scss';
+	
 
 	page {
 		display: flex;
@@ -227,132 +220,42 @@
 		min-height: 100%;
 		height: auto;
 	}
-
-	.tips {
-		color: #67c23a;
-		font-size: 14px;
-		line-height: 40px;
-		text-align: center;
-		background-color: #f0f9eb;
-		height: 0;
-		opacity: 0;
-		transform: translateY(-100%);
-		transition: all 0.3s;
-	}
-
-	.tips-ani {
-		transform: translateY(0);
-		height: 40px;
-		opacity: 1;
-	}
-
-	.shop {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		
-	}
-
-	// 默认加入 scoped ，所以外面加一层提升权重
-	.list {
-		.uni-list--waterfall {
-
-			/* #ifndef H5 || APP-VUE */
-			// 小程序 编译后会多一层标签，而其他平台没有，所以需要特殊处理一下
-			/deep/ .uni-list {
-				/* #endif */
-				display: flex;
-				flex-direction: row;
-				flex-wrap: wrap;
-				padding: 5rpx;
-				box-sizing: border-box;
-
-				/* #ifdef H5 || APP-VUE */
-				// h5 和 app-vue 使用深度选择器，因为默认使用了 scoped ，所以样式会无法穿透
-				/deep/
-				/* #endif */
-				.uni-list-item--waterfall {
-					width: 50%;
-					box-sizing: border-box;
-					
-					.uni-list-item__container {
-						padding: 0rpx;
-						flex-direction: column;
-					}
-				}
-
-				/* #ifndef H5 || APP-VUE */
-			}
-
-			/* #endif */
-		}
-	}
-	
-	.item_content{
-		background: white;
-		width: 100%;
-		height: 390rpx;
-		margin-right: 20rpx;
-		padding-top: 20rpx;
-		padding-bottom: 20rpx;
-	}
-	
-	.mainimage{
-		width: 100%;
-		height: 300rpx;
-		display: block;
-		border-radius: 0rpx;
-	}
-	.viewinrow{
-		display:flex;
-		flex-direction: row;
-		justify-content:center;
-		align-items: center;
-	}
-	.buyBTact{
-		display:flex;
-		flex-direction: row;
-		justify-content:space-between;
-		align-items: center;
-	}
-	
-	.title{
-		padding-top: 8rpx;
-		width: 100%;
-		text-align: left;
-		font-size: 32rpx;
-		line-height: 32rpx;
-		font-weight:initial
-	}
-	.Dishes{
-		width: 100%;
-		text-align: left;
-		font-size: 28rpx;
-		line-height: 28rpx;
-		color: darkgray;
-	}
-	
-	.price{
-		width: 100%;
-		text-align: left;
-		font-size: 28rpx;
-		line-height: 28rpx;
-		color: #E02F73;
-	}
-	
-
-	.xingxing{
-		width: 40rpx;
-		height: 40rpx;
-	}
-	.pingfentext{
-		width: 100%;
-		text-align: left;
-		font-size: 28rpx;
-		line-height: 28rpx;
-		color: black;
-	}
+.item_content{
+  	background: white;
+  	width: 660rpx;
+	margin-bottom: 30rpx;
+	padding: 16rpx;
+	border-radius: 16rpx;
+  }
+  .item_list{
+  	padding-left: 40rpx;
+  	display: flex;
+  	flex-direction: row;
+  	justify-content: flex-start;
+  }
+  
+  .itemA_content{
+  	width: 150rpx;
+  	height: 220rpx;
+  	margin: 16rpx 0;
+  	padding: 14rpx;
+  	box-sizing: border-box;
+  	image{
+  		width: 130rpx;
+  		height:130rpx;
+  		background-color:whitesmoke;
+  		display: block;
+  	}
+  	
+  	.title{
+  		width: 100%;
+  		text-align: center;
+  		font-size: 24rpx;
+  		line-height: 30rpx;
+  		padding-top: 4rpx;
+  	}
+  }	
+  
 </style>
 
 

msdYongHu/pages/shanpinxungou/shangjia/shoppingCart.vue

@@ -0,0 +1,337 @@
+<template>
+	<view class="contentV">
+		<customNav :shownav="true" :title="$t('gouwu.gouwuche')" titledetl=""></customNav>
+		<view v-if="!kongche" class="actBTV viewpading">
+			<view >
+				<image class="touyuan" src="/static/meishi/BuyS@3x.png" mode="widthFix"></image>
+				<text style="margin-left: 20rpx;">{{gouwuche.mendname}}</text>
+			</view>
+			<image class="touyuan" src="/static/images/sanchu@3x.png" mode="widthFix" @click="qingkonggouwuc"></image>
+		</view>
+		<view v-if="kongche" class="actBTV" style="height: 80rpx;padding-top:40rpx;background-color: whitesmoke">
+			<view class="">
+				<image class="touyuan" src="/static/meishi/BuyS@3x.png" mode="widthFix"></image>
+				<text style="margin-left: 20rpx;">{{$t('gouwu.gwckongong')}}</text>
+			</view>
+		</view>
+		<view>
+			<view v-for="(items,indexs) in gouwuche">
+				<view class="contentInRowL" style="align-items: center;">
+					<netImage style="margin-left: 12rpx;margin-top: 10rpx;" width="60" height="60" bradius="30" :mysrc="items.logo" mymode="scaleToFill"></netImage>
+					<text style="padding-left: 10rpx;">{{items.posName}}</text>
+				</view>
+				<view v-for="(item,index) in items.food">
+					<view class="spnodetail">
+						<view class="">
+							<myImage class="spIcon" :mysrc="item.image" mymode="scaleToFill"></myImage>
+						</view>
+						<view style="width: 100%;">
+							<view class="actBTV">
+								<view style="font-size: 30rpx;">{{item.name}}</view>
+							</view>
+							<view class="keywordLct" >
+								<view class="kouweisku" v-for="sku in item.ask">{{sku}}</view>
+							</view>
+							<view class="contentInRowS" style="margin-bottom: 8rpx;">
+								<view style="font-size: 26rpx;color: blueviolet;margin-right: 10rpx;">{{$t('shangpin.shoujia')}}: {{Rdanjia(item.price,item.otherPrice)}}{{$t('locale.huobidw')}}</view>
+								<view class="viewinrow" >
+									<image v-if="item.number>0" class="imageRJ" src="/static/meishi/jianh.png" mode="aspectFit" @click="jiangouwuche(indexs,index)"></image>
+									<text v-if="item.number>0" class="textR">{{item.number}}</text>
+									<image class="imageR" src="/static/meishi/jiah.png" mode="aspectFit" @click="jiagouwuche(indexs,index)"></image>
+								</view>
+							</view>
+							<view v-if="item.beizhu" class="">
+								<text style="font-size: 30rpx;color:#00A6FF;">{{item.beizhu}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		<view  class="bottomfloatV">
+			<view class="buyBT" >
+				<image class="gouwuche" :src="gouwcheimg" mode="aspectFit"></image>
+				<label class="peisongsuoming">{{notext}}</label>
+				<label class="qjs" :style="{backgroundColor:gwbcolor,color:gwbTcolor}" @click="qujiesuan">{{$t('comp.qujiesuan')}}</label>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				gouwuche:[],
+				gwbcolor:'darkgray',
+				gwbTcolor:'black',
+				gouwcheimg:'/static/meishi/BuyS@3x.png',
+				notext:this.$t('comp.weixgsp'),
+				goumaijine:0,
+				kongche:false
+			}
+		},
+		onShow() {
+			this.kongche = false;
+			var gwc = uni.getStorageSync('gouwuche');
+			if(''==gwc||null==gwc||undefined==gwc){
+				this.kongche=true;
+				this.gouwuche=[];
+				console.log('!!!!!!!!!!!!!:',this.gouwuche);
+				return
+			}
+			else{
+				this.gouwuche = JSON.parse(gwc);
+			}
+			
+			this.tongjigouwuche();
+		},
+		methods: {
+			qingkonggouwuc(){
+				var that = this;
+				uni.showModal({
+				    title: that.$t('api.message'),
+				    content: that.$t('gouwu.shifouqkgwc'),
+					cancelText:that.$t('order.quxiao'),
+					confirmText:that.$t('comp.queren'),
+				    success: function (res) {
+						if (res.confirm) { //这里是点击了确定以后
+							uni.setStorageSync('gouwuche','');
+							that.kongche=true;
+							that.gouwuche=[];
+							that.gwbcolor='darkgray';
+							that.gwbTcolor='black';
+							that.notext=that.$t('comp.weixgsp');
+							that.gouwcheimg='/static/meishi/BuyS@3x.png';
+							that.goumaijine = 0;
+						} else { //这里是点击了取消以后
+						  console.log('用户点击取消')
+						}
+						
+				    }
+				})
+			},
+			Rdanjia(price,othprice){
+				if(!othprice){
+					othprice=0;
+				}
+				return this.$formPr((parseFloat(price)+parseFloat(othprice)));
+			},
+			jiangouwuche(indexs,index){
+				var goumail=this.gouwuche[indexs].food[index].number;
+				goumail=goumail-1;
+				
+				if(goumail==0){
+					this.gouwuche[indexs].food.splice(index,1);
+					if(this.gouwuche[indexs].food.length==0){
+						this.gouwuche.splice(indexs,1);
+						let gwc = JSON.stringify(this.gouwuche);
+						uni.setStorageSync('gouwuche',gwc);
+						this.tongjigouwuche();
+						return;
+					}
+				}
+				else{
+					this.gouwuche[indexs].food[index].number=goumail;
+				}
+				console.log(goumail);
+				var goumaijine = 0;
+				for (var j=0;j<this.gouwuche[indexs].food.length;j++) {
+					var food =  this.gouwuche[indexs].food[j];
+					var yidongjine=food.number*(parseFloat(food.price)+parseFloat(food.otherPrice));
+					goumaijine = goumaijine+yidongjine;
+				}
+				this.gouwuche[indexs].amount=goumaijine;
+				
+				let gwc = JSON.stringify(this.gouwuche);
+				uni.setStorageSync('gouwuche',gwc);
+				this.tongjigouwuche();
+			},
+			jiagouwuche(indexs,index){
+				var goumail=this.gouwuche[indexs].food[index].number;
+				goumail=goumail+1;
+				this.gouwuche[indexs].food[index].number=goumail;
+				console.log(goumail);
+				var goumaijine = 0;
+				for (var j=0;j<this.gouwuche[indexs].food.length;j++) {
+					var food =  this.gouwuche[indexs].food[j];
+					var yidongjine=food.number*(parseFloat(food.price)+parseFloat(food.otherPrice));
+					goumaijine = goumaijine+yidongjine;
+				}
+				this.gouwuche[indexs].amount=goumaijine;
+				let gwc = JSON.stringify(this.gouwuche);
+				uni.setStorageSync('gouwuche',gwc);
+				this.tongjigouwuche();
+			},
+			
+			tongjigouwuche(){
+				this.goumaijine = 0;
+				
+				for(var i=0;i<this.gouwuche.length;i++){
+					var item = this.gouwuche[i];
+					var yidongjine=item.amount;
+					this.goumaijine = this.goumaijine+yidongjine;
+				}
+				if(this.goumaijine>0){
+					this.notext= this.$formPr(this.goumaijine)+this.$t('locale.huobidw');
+					console.log(this.notext);
+					this.gwbcolor='green';
+					this.gwbTcolor='white';
+					this.gouwcheimg='/static/meishi/BuyS@3x.png';
+				}
+				if(this.goumaijine==0){
+					this.gwbcolor='darkgray';
+					this.gwbTcolor='black';
+					this.notext=this.$t('comp.weixgsp');
+					this.gouwcheimg='/static/meishi/BuyS@3x.png';
+				}
+			},
+			qujiesuan(){
+				var that = this;
+				if(this.goumaijine==0){
+					uni.showToast({
+					    title: that.$t('comp.qingxzsp'),
+					    icon: 'none',
+					    duration: 2500
+					})
+					return;
+				}
+				var token = uni.getStorageSync("token");
+				if(token == '' || token == undefined || token == null){
+					uni.navigateTo({
+						url:'/pages/UserCenter/LoginView'
+					})
+					return;
+				}
+				uni.navigateTo({
+					url:'/pages/OrderList/buy/dingdanjiesuan'
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F2F3F7;
+	}
+	.contentV{
+		width:94%;
+		margin-left: 3%;
+		background-color: white;
+	}
+	.viewinrow{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	
+	.touyuan{
+		width: 40rpx;
+	}
+	
+	.viewpading{
+		padding: 3%;
+		width:94%;
+	}
+	
+	.actBTV{
+		display: flex;
+		flex-direction: row;
+		justify-content:space-between;
+		align-items: center;
+	}
+	.spnodetail{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		background-color: white;
+		border-bottom: 2rpx solid lightgray;
+	}
+	.spIcon{
+		margin: 20rpx;
+		width: 90rpx;
+		height: 90rpx;
+	}
+	.xiaoji{
+		margin-left: auto;
+		margin-right: 30rpx;
+	}
+	.keywordLct{
+		display: flex;
+		flex-wrap: wrap;
+		justify-content:flex-start;
+		align-items:center;
+	}
+	.kouweisku{
+		padding:0rpx 4rpx 0rpx 4rpx;
+		margin-right: 6rpx;
+		margin-top: 6rpx;
+		margin-bottom: 4rpx;
+		font-size: 26rpx;
+		text-align: center;
+		box-sizing: border-box;
+		border: 2rpx solid lightgray;
+		border-radius: 30rpx;
+		color: orangered;
+	}
+	
+	.imageRJ{
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 8rpx;
+	}
+	.imageR{
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 30rpx;
+	}
+	.textR{
+		font-size: 26rpx;
+		margin-left: 6rpx;
+		margin-right: 6rpx;
+	}
+	
+
+	.bottomfloatV{
+		position: fixed;
+		flex-direction: row;
+		align-items: center;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 999;
+		background-color: whitesmoke;
+		height: 120rpx;
+	}
+	.buyBT{
+		display:flex;
+		flex-direction: row;
+		justify-content:flex-start;
+		align-items: center;
+		margin-top: 20rpx;
+		width:100%;
+	}
+	.peisongsuoming{
+		font-size: 26rpx;
+		line-height: 38rpx;
+		height: 38rpx;
+		color: dimgray;
+	}
+	.gouwuche{
+		margin-left: 20rpx;
+		width: 80rpx;
+		height: 80rpx;
+	}
+	.qjs{
+		border-radius: 30rpx;
+		padding-left: 26rpx;
+		padding-right: 26rpx;
+		margin-left: auto;
+		margin-right: 30rpx;
+		font-size: 32rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+	}
+</style>

msdYongHu/pages/shanpinxungou/shangpin/shangpin.vue

@@ -1,411 +0,0 @@
-<template>
-	<view class="tabs">
-		<scroll-view ref="tabbar1" id="tab-bar" class="tab-bar" :scroll="false" :scroll-x="true" :show-scrollbar="false"
-			:scroll-into-view="scrollInto">
-			<view style="flex-direction: column;">
-				<view style="flex-direction: row;">
-					<view class="uni-tab-item" v-for="(tab,index) in tabList" :key="tab.id" :id="tab.id"
-						:ref="'tabitem'+index" :data-id="index" :data-current="index" @click="ontabtap">
-						<text class="uni-tab-item-title"
-							:class="tabIndex==index ? 'uni-tab-item-title-active' : ''">{{tab.name}}</text>
-					</view>
-				</view>
-				<view class="scroll-view-indicator">
-					<view ref="underline" class="scroll-view-underline" :class="isTap ? 'scroll-view-animation':''"
-						:style="{left: indicatorLineLeft + 'px', width: indicatorLineWidth + 'px'}"></view>
-				</view>
-			</view>
-		</scroll-view>
-		<view class="tab-bar-line"></view>
-		<swiper class="tab-view" ref="swiper1" id="tab-bar-view" :current="tabIndex" :duration="300"
-			@change="onswiperchange" @transition="onswiperscroll" @animationfinish="animationfinish"
-			@onAnimationEnd="animationfinish">
-			<swiper-item class="swiper-item" v-for="(page, index) in tabList" :key="index">
-				<swiper-page class="swiper-page" :pid="page.pageid" ref="page" v-on:EspItemsel="spItemsel"></swiper-page>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	// #ifdef APP-PLUS
-	const dom = weex.requireModule('dom');
-	// #endif
-
-	// 缓存每页最多
-	const MAX_CACHE_DATA = 100;
-
-	// 缓存页签数量
-	const MAX_CACHE_PAGE = 3;
-	const TAB_PRELOAD_OFFSET = 1;
-
-	import swiperPage from './shangpinItem.vue';
-
-	export default {
-		components: {
-			swiperPage
-		},
-		data() {
-			return {
-				tabList: [],
-				tabIndex: 0,
-				cacheTab: [],
-				scrollInto: "",
-				indicatorLineLeft: 0,
-				indicatorLineWidth: 0,
-				isTap: false,
-				showTitleView: true,
-				pageId: "page",
-				refreshing: false,
-				refreshText: "",
-				refreshFlag: false
-			}
-		},
-		onLoad() {
-			
-			this.tabList.push({
-				id: "tab" + 1,
-				name: this.$t('goods.zhonghepx'),
-				pageid: 1
-			});
-			this.tabList.push({
-				id: "tab" + 2,
-				name: this.$t('goods.juliyx'),
-				pageid: 2
-			});
-			this.tabList.push({
-				id: "tab" + 3,
-				name: this.$t('goods.xiaoliangyx'),
-				pageid: 3
-			});
-			
-			/*
-			for (var i = 0; i < 6; i++) {
-				this.tabList.push({
-					id: "tab" + i,
-					name: 'Tab ' + (i + 1),
-					pageid: i + 1
-				})
-			}
-			*/
-		},
-		onReady() {
-			this._lastTabIndex = 0;
-			this.swiperWidth = 0;
-			this.tabbarWidth = 0;
-			this.tabListSize = {};
-			this._touchTabIndex = 0;
-
-			this.pageList = this.$refs.page;
-			this.selectorQuery();
-		},
-		methods: {
-			ontabtap(e) {
-				let index = e.target.dataset.current || e.currentTarget.dataset.current;
-				//let offsetIndex = this._touchTabIndex = Math.abs(index - this._lastTabIndex) > 1;
-
-				// #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-QQ
-				this.isTap = true;
-				var currentSize = this.tabListSize[index];
-				this.updateIndicator(currentSize.left, currentSize.width);
-				this._touchTabIndex = index;
-				// #endif
-
-				this.switchTab(index);
-			},
-			onswiperchange(e) {
-				// 注意：百度小程序会触发2次
-
-				// #ifndef APP-PLUS || H5 || MP-WEIXIN || MP-QQ
-				let index = e.target.current || e.detail.current;
-				this.switchTab(index);
-				// #endif
-			},
-			onswiperscroll(e) {
-				if (this.isTap) {
-					return;
-				}
-
-				var offsetX = e.detail.dx;
-				var preloadIndex = this._lastTabIndex;
-				if (offsetX > TAB_PRELOAD_OFFSET) {
-					preloadIndex++;
-				} else if (offsetX < -TAB_PRELOAD_OFFSET) {
-					preloadIndex--;
-				}
-				if (preloadIndex === this._lastTabIndex || preloadIndex < 0 || preloadIndex > this.pageList.length - 1) {
-					return;
-				}
-				if (this.pageList[preloadIndex].dataList.length === 0) {
-					this.loadTabData(preloadIndex);
-				}
-
-				// #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-QQ
-				var percentage = Math.abs(this.swiperWidth / offsetX);
-				var currentSize = this.tabListSize[this._lastTabIndex];
-				var preloadSize = this.tabListSize[preloadIndex];
-				var lineL = currentSize.left + (preloadSize.left - currentSize.left) / percentage;
-				var lineW = currentSize.width + (preloadSize.width - currentSize.width) / percentage;
-				this.updateIndicator(lineL, lineW);
-				// #endif
-			},
-			animationfinish(e) {
-				// #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-QQ
-				let index = e.detail.current;
-				if (this._touchTabIndex === index) {
-					this.isTap = false;
-				}
-				this._lastTabIndex = index;
-				this.switchTab(index);
-				this.updateIndicator(this.tabListSize[index].left, this.tabListSize[index].width);
-				// #endif
-			},
-			selectorQuery() {
-				// #ifdef APP-NVUE
-				// 查询 tabbar 宽度
-				uni.createSelectorQuery().in(this).select('#tab-bar').boundingClientRect().exec(rect => {
-					this.tabbarWidth = rect[0].width;
-				});
-				// 查询 tabview 宽度
-				uni.createSelectorQuery().in(this).select('#tab-bar-view').boundingClientRect().exec(rect => {
-					this.swiperWidth = rect[0].width;
-				});
-
-				// 因 nvue 暂不支持 class 查询
-				var queryTabSize = uni.createSelectorQuery().in(this);
-				for (var i = 0; i < this.tabList.length; i++) {
-					queryTabSize.select('#' + this.tabList[i].id).boundingClientRect();
-				}
-				queryTabSize.exec(rects => {
-					rects.forEach((rect) => {
-						this.tabListSize[rect.dataset.id] = rect;
-					})
-					this.updateIndicator(this.tabListSize[this.tabIndex].left, this.tabListSize[this.tabIndex]
-						.width);
-					this.switchTab(this.tabIndex);
-				});
-				// #endif
-
-				// #ifdef MP-WEIXIN || H5 || MP-QQ
-				uni.createSelectorQuery().in(this).select('.tab-view').fields({
-					dataset: true,
-					size: true,
-				}, (res) => {
-					this.swiperWidth = res.width;
-				}).exec();
-				uni.createSelectorQuery().in(this).selectAll('.uni-tab-item').boundingClientRect((rects) => {
-					rects.forEach((rect) => {
-						this.tabListSize[rect.dataset.id] = rect;
-					})
-					this.updateIndicator(this.tabListSize[this.tabIndex].left, this.tabListSize[this.tabIndex]
-						.width);
-				}).exec();
-				// #endif
-			},
-			updateIndicator(left, width) {
-				this.indicatorLineLeft = left;
-				this.indicatorLineWidth = width;
-			},
-			switchTab(index) {
-				if (this.pageList[index].dataList.length === 0) {
-					this.loadTabData(index);
-				}
-
-				if (this.tabIndex === index) {
-					return;
-				}
-
-				// 缓存 tabId
-				if (this.pageList[this.tabIndex].dataList.length > MAX_CACHE_DATA) {
-					let isExist = this.cacheTab.indexOf(this.tabIndex);
-					if (isExist < 0) {
-						this.cacheTab.push(this.tabIndex);
-					}
-				}
-
-				this.tabIndex = index;
-
-				// #ifdef APP-NVUE
-				this.scrollTabTo(index);
-				// #endif
-				// #ifndef APP-NVUE
-				this.scrollInto = this.tabList[index].id;
-				// #endif
-
-				// 释放 tabId
-				if (this.cacheTab.length > MAX_CACHE_PAGE) {
-					let cacheIndex = this.cacheTab[0];
-					this.clearTabData(cacheIndex);
-					this.cacheTab.splice(0, 1);
-				}
-			},
-			scrollTabTo(index) {
-				const el = this.$refs['tabitem' + index][0];
-				let offset = 0;
-				// TODO fix ios offset
-				if (index > 0) {
-					offset = this.tabbarWidth / 2 - this.tabListSize[index].width / 2;
-					if (this.tabListSize[index].right < this.tabbarWidth / 2) {
-						offset = this.tabListSize[0].width;
-					}
-				}
-				dom.scrollToElement(el, {
-					offset: -offset
-				});
-			},
-			loadTabData(index) {
-				this.pageList[index].loadData();
-			},
-			clearTabData(index) {
-				this.pageList[index].clear();
-			},
-			onrefresh(e) {
-				this.refreshing = true;
-				this.refreshText = "刷新中...";
-				setTimeout(() => {
-					this.refreshing = false;
-					this.refreshFlag = false;
-					this.refreshText = "已刷新";
-				}, 2000)
-			},
-			onpullingdown(e) {
-				if (this.refreshing) {
-					return;
-				}
-
-				this.pulling = false;
-				if (Math.abs(e.pullingDistance) > Math.abs(e.viewHeight)) {
-					this.refreshFlag = true;
-					this.refreshText = "释放立即刷新";
-				} else {
-					this.refreshFlag = false;
-					this.refreshText = "下拉可以刷新";
-				}
-			},
-			spItemsel(e){
-				console.log(e);
-				uni.navigateTo({
-					url:'/pages/shanpinxungou/shangpin/shangpinxiangqing'
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-	/* #ifndef APP-PLUS */
-	page {
-		width: 100%;
-		min-height: 100%;
-		display: flex;
-	}
-
-	/* #endif */
-
-	.page {
-		flex: 1;
-	}
-
-	.flexible-view {
-		background-color: #f823ff;
-	}
-
-	.tabs {
-		flex: 1;
-		flex-direction: column;
-		overflow: hidden;
-		background-color: #ffffff;
-		/* #ifdef MP-ALIPAY || MP-BAIDU */
-		height: 100vh;
-		/* #endif */
-	}
-
-	.tab-bar {
-		width: 750upx;
-		height: 84upx;
-		flex-direction: row;
-		/* #ifndef APP-PLUS */
-		white-space: nowrap;
-		/* #endif */
-	}
-
-	/* #ifndef APP-NVUE */
-	.tab-bar ::-webkit-scrollbar {
-		display: none;
-		width: 0 !important;
-		height: 0 !important;
-		-webkit-appearance: none;
-		background: transparent;
-	}
-
-	/* #endif */
-
-	.scroll-view-indicator {
-		position: relative;
-		height: 2px;
-		background-color: transparent;
-	}
-
-	.scroll-view-underline {
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		width: 0;
-		background-color: #007AFF;
-	}
-
-	.scroll-view-animation {
-		transition-duration: 0.2s;
-		transition-property: left;
-	}
-
-	.tab-bar-line {
-		height: 1upx;
-		background-color: #cccccc;
-	}
-
-	.tab-view {
-		flex: 1;
-	}
-
-	.uni-tab-item {
-		/* #ifndef APP-PLUS */
-		display: inline-block;
-		/* #endif */
-		flex-wrap: nowrap;
-		padding-left: 25px;
-		padding-right: 25px;
-	}
-
-	.uni-tab-item-title {
-		color: #555;
-		font-size: 30upx;
-		height: 80upx;
-		line-height: 80upx;
-		flex-wrap: nowrap;
-		/* #ifndef APP-PLUS */
-		white-space: nowrap;
-		/* #endif */
-	}
-
-	.uni-tab-item-title-active {
-		color: #007AFF;
-	}
-
-	.swiper-item {
-		flex: 1;
-		flex-direction: column;
-	}
-
-	.swiper-page {
-		flex: 1;
-		flex-direction: column;
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-	}
-
-</style>
-

msdYongHu/pages/shanpinxungou/shangpin/shangpinItem.vue

@@ -1,248 +0,0 @@
-<template>
-	<list class="list" :offset-accuracy="5" :bounce="false" isSwiperList="true">
-		<refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown"
-			:display="refreshing ? 'show' : 'hide'">
-			<div class="refresh-view">
-				<text class="loading-text">{{refreshText}}</text>
-			</div>
-		</refresh>
-		<cell v-for="(item, index) in dataList" :key="item.id" @click="onclick(item.id)">
-			<view class="item_content2">
-				<view class="buyctT">
-					<image class="goodimage" src="/static/defimages/324.png" mode="aspectFit"></image>
-					<view class="msText">
-						<text class="dianpuming">羊肉串5元/份</text>
-						<text class="peisongsuoming">新鲜大串</text>
-						<view class="buyBT">
-							<text class="youhuixinxi">新客暴抢￥4</text>
-							<text class="youhuixinxi">低至8.5折</text>
-							<text class="youhuixinxi">满100减20</text>
-						</view>
-						<view class="buyBTSB">
-							<text class="peisongsuoming">￥15</text>
-							<text class="peisongsuoming">月销300+</text>
-						</view>
-					</view>
-				</view>
-				<view class="linesp"></view>
-				<view class="buyct">
-					<image class="sjimage" src="/static/defimages/324.png" mode="aspectFit"></image>
-					<view class="msText">
-						<text class="dianpuming">拥您烧烤</text>
-						<view class="buyBT">
-							<image class="xingxing" src="/static/images/评分、星星.png" mode="aspectFit"></image>
-							<text class="pingfentext">4.9</text>
-							<text class="mainyuntishi">5KM免运费</text>
-							<text class="shijiantishi">约20分钟</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</cell>
-	</list>
-</template>
-
-<script>
-	import uniList from '@/uni_modules/uni-list/uni-list.vue';
-	import uniListItem from '@/uni_modules/uni-list-item/uni-list-item.vue';
-	import uniAd from '@/uni_modules/uni-list-ad/uni-list-ad.vue';
-	import uniChat from '@/uni_modules/uni-list-chat/uni-list-chat.vue';
-	export default {
-			components:{
-				uniList,uniListItem,uniAd,uniChat
-			},
-		props: {
-			pid: {
-				type: [Number, String],
-				default: ''
-			},
-			parentId: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				scrollable: true,
-				dataList: [],
-				refreshing: false,
-				refreshText: "",
-				refreshFlag: false,
-				itemType:2,
-			}
-		},
-		created() {
-			for (var i = 1; i < 32; i++) {
-				this.dataList.push({
-					id: i,
-					name: i
-				});
-			}
-		},
-		methods: {
-			onclick(e) {
-				console.log(e);
-				this.$emit('EspItemsel',e);
-			},
-			loadData() {
-				// 首次激活时被调用
-			},
-			clear() {
-				// 释放数据时被调用，参考 swiper-list 缓存配置
-				this.dataList.length = 0;
-			},
-			onrefresh(e) {
-				this.refreshing = true;
-				this.refreshText = "刷新中...";
-				setTimeout(() => {
-					this.refreshing = false;
-					this.refreshFlag = false;
-					this.refreshText = "已刷新";
-				}, 2000)
-			},
-			onpullingdown(e) {
-				if (this.refreshing) {
-					return;
-				}
-
-				this.pulling = false;
-				if (Math.abs(e.pullingDistance) > Math.abs(e.viewHeight)) {
-					this.refreshFlag = true;
-					this.refreshText = "释放立即刷新";
-				} else {
-					this.refreshFlag = false;
-					this.refreshText = "下拉可以刷新";
-				}
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.refresh-view {
-		width: 750rpx;
-		height: 80px;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.list {
-		flex: 1;
-		background-color: #ebebeb;
-	}
-
-	.linesp{
-		height: 2rpx;
-		background-color: aliceblue;
-	}
-	.item_content2{
-		background: white;
-		height: 300rpx;
-		margin: 10rpx;
-		box-sizing: border-box;
-		border-radius: 15rpx;
-		border: 2rpx solid darkgray;
-	}
-	.buyctT{
-		height: 190rpx;
-		padding: 14rpx;
-		display: flex;
-		flex-direction: row;
-	}
-	.buyct{
-		height: 160rpx;
-		padding: 14rpx;
-		display: flex;
-		flex-direction: row;
-	}
-	.goodimage{
-		width: 160rpx;
-		height: 160rpx;
-	}
-	.sjimage{
-		width: 80rpx;
-		height: 80rpx;
-	}
-	.buyBTSB{
-		display: flex;
-		flex-direction: row;
-		justify-content:space-between;
-		align-items: center;
-	}
-	
-	.buyBT{
-		display: flex;
-		flex-direction: row;
-		justify-content:left;
-		align-items: center;
-		
-	}
-	.rightjustify{
-		margin-left: auto;
-		display: flex;
-		flex-direction: row;
-		justify-content:right;
-		
-	}
-	.msText{
-		width: 530rpx;
-		padding-left: 10rpx;
-		font-size: 22rpx;
-		line-height: 32rpx;
-	}
-	.dianpuming{
-		font-size: 30rpx;
-		line-height: 32rpx;
-		height: 32rpx;
-		font-weight: bold;
-	}
-	.peisongsuoming{
-		font-size: 26rpx;
-		line-height: 38rpx;
-		height: 38rpx;
-		color: dimgray;
-	}
-	.xiaoliang{
-		margin-left: auto;
-		margin-right: 10rpx;
-	}
-	.xingxing{
-		width: 40rpx;
-		height: 40rpx;
-	}
-	.pingfentext{
-		font-size: 26rpx;
-		line-height: 40rpx;
-		height: 40rpx;
-		color:sandybrown;
-	}
-	.mainyuntishi{
-		margin-left: 30rpx;
-		padding-left: 8rpx;
-		padding-right: 8rpx;
-		font-size: 26rpx;
-		line-height: 40rpx;
-		height: 40rpx;
-		color: dimgray;
-		background-color: burlywood;
-	}
-	.shijiantishi{
-		margin-left: 30rpx;
-		font-size: 26rpx;
-		line-height: 40rpx;
-		height: 40rpx;
-		color: dimgray;
-	}
-	.youhuixinxi{
-		margin-right: 10rpx;
-		font-size: 26rpx;
-		line-height: 40rpx;
-		height: 40rpx;
-		color: lightcoral;
-		border: 2rpx solid lightcoral;
-		border-radius: 8rpx;
-	}
-	
-	
-</style>

msdYongHu/pages/shanpinxungou/shangpin/shangpinList/shangpinList.vue

@@ -53,8 +53,9 @@
 						</view>
 						<view style="width: 94%;background-color:papayawhip;height: 2rpx;margin-left: 3%;"></view>
 						<view class="buyct" @click="gotomendian(item.store.id)">
-							<!-- <image class="sjimage" src="/static/defimages/324.png" mode="aspectFit"></image> -->
-							<myImage class="sjimage" :mysrc="item.store.image" mymode="scaleToFill"></myImage>
+							
+							<!-- <myImage class="sjimage" :mysrc="item.store.logo" mymode="scaleToFill"></myImage> -->
+							<netImage width="120" height="120" bradius="60" :mysrc="item.store.logo" mymode="scaleToFill"></netImage>
 							<view class="msText">
 								<text class="dianpuming">{{item.store.posName}}</text>
 								<view class="buyBT">
@@ -72,23 +73,22 @@
 			</view>
 			<view v-if="listShow&&BtState==2" style="background-color:#efeff4;">
 				<!-- to 属性携带参数跳转详情页面，当前只为参考 -->
-				<view class="contentColumnC" style="width:700rpx;margin-left:25rpx;" v-for="(item,index) in store" :key="index">
-					<view class="item_content" @click="gotomendian(item.id)">
-						<netImage style="background-color: whitesmoke;" width="700" height="410" :mysrc="item.image"></netImage>
-						<view class="title textfontB3">
-							<text >{{item.posName}}</text>
-						</view>
-						<view class="contentInRowS">
-							<view class="price textfontB5">
-								<text>{{$t('index.manX')}} {{$formPr(item.posPrice)}}{{$t('locale.huobidw')}}</text>
+				<view class="contentColumn" style="width:700rpx;margin-left:25rpx;margin-top: 20rpx;" v-for="(item,index) in store" :key="index">
+					<view class="buyct" @click="gotomendian(item.id)">
+						
+						<!-- <myImage class="sjimage" :mysrc="item.store.logo" mymode="scaleToFill"></myImage> -->
+						<netImage width="120" height="120" bradius="60" :mysrc="item.logo" mymode="scaleToFill"></netImage>
+						<view class="msText">
+							<text class="dianpuming">{{item.posName}}</text>
+							<view class="buyBT">
+								<image class="xingxing" src="/static/images/xingxing@3x.png" mode="aspectFit"></image>
+								<text class="pingfentext">4.9</text>
+								<text class="mainyuntishi">{{$t('index.manX')}} {{$formPr(item.posPrice)}}{{$t('locale.huobidw')}}</text>
 							</view>
-							<view class="contentInRowR" style="margin-right: 8rpx;">
-								<text v-if="item.state==0&&item.offShelf=='0'" style="color: green;">{{$t('mend.stateyy')}}</text>
-								<text v-if="item.state==1&&item.offShelf=='0'" style="color: crimson;">{{$t('mend.statedy')}}</text>
-								<text v-if="item.offShelf=='1'" style="color: darkgray;">{{$t('mend.mendianyxj')}}</text>
+							<view class="buyBT">
+								<text class="shijiantishi">{{$t('mend.waisongsj')}}</text>
 							</view>
 						</view>
-						
 					</view>
 				</view>
 			</view>
@@ -158,7 +158,7 @@
 			},
 			gotomendian(id){
 				uni.navigateTo({
-					url:'/pages/shanpinxungou/shangjia/shangjiaView?id='+id+'&isShangjia=0'
+					url:'/pages/shanpinxungou/shangjia/merchantdetail?id='+id+'&isShangjia=0'
 				})
 			},
 			seachwordSl(keyword){
@@ -407,6 +407,7 @@ page {
 		height: 40rpx;
 		color: dimgray;
 		background-color: burlywood;
+		border-radius: 4rpx;
 	}
 	.shijiantishi{
 		margin-left: 30rpx;

msdYongHu/pages/shanpinxungou/shangpin/shangpinxiangqing.vue

@@ -35,14 +35,14 @@
 		</view>
 		<view style="height: 170rpx;"></view>
 		<view  class="bottomfloatV">
-			<view class="buyBT" @click="qujiesuan">
-				<image class="gouwuche" :src="gouwcheimg" mode="aspectFit"></image>
+			<view class="buyBT" >
+				<image class="gouwuche" :src="gouwcheimg" mode="aspectFit" @click="gotoGouwuche"></image>
 				<text class="peisongsuoming">{{notext}}</text>
-				<text class="qjs" :style="{backgroundColor:gwbcolor,color:gwbTcolor}">{{$t('comp.lijigoumai')}}</text>
+				<text class="qjs" :style="{backgroundColor:gwbcolor,color:gwbTcolor}" @click="qujiesuan">{{$t('comp.lijigoumai')}}</text>
 			</view>
 		</view>
 		<popViewGG :show="showpop" :showbotom="false" :maskClosable="true" :isCancel="true" @chooseCancel="chooseCancel">
-			<foodxuangou style="width:100%;" :food="spindexSP" v-on:Ejiagouwuche="jiagouwuche"></foodxuangou>
+			<pdPurchase style="width:100%;" :food="spindexSP" v-on:Ejiagouwuche="jiagouwuche"></pdPurchase>
 		</popViewGG>
 		
 	</view>
@@ -185,7 +185,20 @@
 					this.showbt=false;
 				}
 			},
-			
+			gotoGouwuche(){
+				if(!this.showbt){
+					uni.showToast({
+					    title: this.$t('comp.qingxzsp'),
+					    icon: 'none',
+					    duration: 2500
+					})
+					return;
+				}
+				//跳转购物车
+				uni.navigateTo({
+					url:'/pages/shanpinxungou/shangjia/shoppingCart'
+				})
+			},
 			
 			qujiesuan(){
 				if(this.shangpinxq.store.state==1){

msdYongHu/unpackage/cache/wgt/__UNI__F607D49/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>  
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"   
+  package="vn.com.cityexpress168.ptyh">  
+    <!--按下面方式配置需要移除的permissions-->  
+	<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" tools:node="remove"/>
+    <application>  
+        <!--meta-data-->  
+    </application>  
+</manifest>

msdYongHu/unpackage/cache/wgt/__UNI__F607D49/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>

msdYongHu/unpackage/cache/wgt/__UNI__F607D49/androidPrivacy.json

@@ -0,0 +1,92 @@
+{
+  "version": "1",
+  "prompt": "none",
+  "title": "服务协议和隐私政策",
+  "message": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href='https://backend.cityexpress168.com.vn/ynszc.html'>《服务协议》</a>和<a href='https://backend.cityexpress168.com.vn/ynszc.html'>《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+  "buttonAccept": "同意并接受",
+  "buttonRefuse": "暂不同意",
+  "second": {
+    "title": "确认",
+    "message": "　　进入应用前，你需先同意<a href='https://backend.cityexpress168.com.vn/ynszc.html'>《服务协议》</a>和<a href='https://backend.cityexpress168.com.vn/ynszc.html'>《隐私政策》</a>，否则将退出应用。",
+    "buttonAccept": "同意并接受",
+    "buttonRefuse": "退出应用",
+    "titleLocales": {
+      "zh-Hans": "确认",
+      "en": "",
+      "ja": "",
+      "yuenan": "Xác nhận",
+      "zh-Hant": "確認"
+    },
+    "messageLocales": {
+      "zh-Hans": "　　进入应用前，你需先同意<a href='https://backend.cityexpress168.com.vn/ynszc.html'>《服务协议》</a>和<a href='https://backend.cityexpress168.com.vn/ynszc.html'>《隐私政策》</a>，否则将退出应用。",
+      "en": "",
+      "ja": "",
+      "yuenan": "   Trước khi vào ứng dụng, bạn phải đồng ý với<a href='https://backend.cityexpress168.com.vn/ynszc.html'>《Thoả Thuận Dịch Vụ》</a> & <a href='https://backend.cityexpress168.com.vn/ynszc.html'>《Chính Sách Bảo Mật》</a>，Nếu không sẽ thoát khỏi ứng dụng。",
+      "zh-Hant": "　　進入應用前，你需先同意<a href='https://backend.cityexpress168.com.vn/ynszc_tw.html'>《服務協議》</a>和<a href='https://backend.cityexpress168.com.vn/ynszc_tw.html'>《隱私政策》</a>，否則將退出應用。"
+    },
+    "buttonAcceptLocales": {
+      "zh-Hans": "同意并接受",
+      "en": "",
+      "ja": "",
+      "yuenan": "Đồng ý và chấp nhận",
+      "zh-Hant": "同意並接受"
+    },
+    "buttonRefuseLocales": {
+      "zh-Hans": "退出应用",
+      "en": "",
+      "ja": "",
+      "yuenan": "Thoát khỏi ứng dụng",
+      "zh-Hant": "退出應用"
+    }
+  },
+  "disagreeMode": {
+    "support": false,
+    "loadNativePlugins": false,
+    "visitorEntry": false,
+    "showAlways": false
+  },
+  "styles": {
+    "backgroundColor": "#FFFFFF",
+    "borderRadius": "5px",
+    "title": {
+      "color": "#ff00ff"
+    },
+    "buttonAccept": {
+      "color": "#E86E48"
+    },
+    "buttonRefuse": {
+      "color": "#727679"
+    },
+    "buttonVisitor": {
+      "color": "#727679"
+    }
+  },
+  "titleLocales": {
+    "zh-Hans": "服务协议和隐私政策",
+    "en": "",
+    "ja": "",
+    "yuenan": "Thỏa thuận dịch vụ và chính sách bảo mật",
+    "zh-Hant": "服務協議和隱私政策"
+  },
+  "messageLocales": {
+    "zh-Hans": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href='https://backend.cityexpress168.com.vn/ynszc.html'>《服务协议》</a>和<a href='https://backend.cityexpress168.com.vn/ynszc.html'>《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "en": "",
+    "ja": "",
+    "yuenan": "   Vui lòng đọc cẩn thận và hiểu đầy đủ các điều khoản của Thỏa thuận dịch vụ và Chính sách bảo mật bao gồm nhưng không giới hạn: Để cung cấp dịch vụ tốt hơn cho bạn chúng tôi cần thu thập thông tin như nhận dạng thiết bị nhật ký hoạt động của bạn để phân tích và tối ưu hóa hiệu suất ứng dụng.<br/>　　Bạn có thể đọc <a href='https://backend.cityexpress168.com.vn/ynszc_vi.html'>Thỏa thuận dịch vụ</a> và <a href='https://backend.cityexpress168.com.vn/ynszc_vi.html'>Chính sách bảo mật</a>Xem chi tiết. Nếu bạn đồng ý vui lòng nhấp vào nút bên dưới để bắt đầu chấp nhận dịch vụ của chúng tôi.",
+    "zh-Hant": "　　請你務必審慎閱讀、充分理解「服務協議」和「隱私政策」各條款，包括但不限於：為了更好的向你提供服務，我們需要收集你的設備標識、操作日誌等信息用於分析、優化應用性能。<br/>　　你可閱讀<a href='https://backend.cityexpress168.com.vn/ynszc_tw.html'>《服務協議》</a>和<a href='https://backend.cityexpress168.com.vn/ynszc_tw.html'>《隱私政策》</a>了解詳細信息。如果你同意，請點擊下面按鈕開始接受我們的服務。"
+  },
+  "buttonAcceptLocales": {
+    "zh-Hans": "同意并接受",
+    "en": "",
+    "ja": "",
+    "yuenan": "Đồng ý và chấp nhận",
+    "zh-Hant": "同意並接受"
+  },
+  "buttonRefuseLocales": {
+    "zh-Hans": "暂不同意",
+    "en": "",
+    "ja": "",
+    "yuenan": "Tạm thời không đồng ý.",
+    "zh-Hant": "暫不同意"
+  }
+}

msdYongHu/unpackage/cache/wgt/__UNI__F607D49/app-config.js

@@ -0,0 +1 @@
+(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);

msdYongHu/unpackage/cache/wgt/__UNI__F607D49/hybrid/html/maps/css/index.css

@@ -0,0 +1,254 @@
+* {
+	padding: 0;
+	margin: 0;
+}
+
+html,
+body {
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	position: relative;
+}
+
+#map {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.loadinggif {
+	width: 50px;
+	height: 50px;
+	position: fixed;
+	left: 50%;
+	bottom: 50%;
+	margin-left: -25px;
+	margin-top: -25px;
+	z-index: 99;
+}
+
+.gm-style-mtc {
+	display: none;
+}
+
+.gmnoprint {
+	display: none !important;
+}
+
+.gmnoprint.gm-bundled-control.gm-bundled-control-on-bottom {
+	display: none;
+}
+
+.gm-control-active.gm-fullscreen-control {
+	display: none;
+}
+
+[class^="https://maps.google.com/maps"] {
+	display: none !important;
+}
+
+.tabs {
+	width: 60%;
+	height: 40px;
+	margin-left: 20%;
+	position: fixed;
+	left: 0;
+	top: 20px;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	z-index: 100;
+
+}
+
+.tabs div {
+	width: 100px;
+	height: 40px;
+	font-size: 18px;
+	font-weight: 700;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 20px;
+	position: relative;
+	color: #666;
+}
+
+.tabs .active span {
+	position: relative;
+	font-size: 20px;
+	font-weight: bold;
+	color: #333;
+}
+
+.tabs .active span ::after {
+	content: '';
+	width: 20px;
+	height: 5px;
+	background-color: saddlebrown;
+	position: absolute;
+	left: 20px;
+	bottom: 10px;
+
+}
+
+.tabs-left {}
+
+.tabs-right {}
+
+
+
+/* 动画 */
+.loader {
+	position: fixed;
+	z-index: 99;
+	border: 8px solid #f3f3f3;
+	border-top: 8px solid #ea4335;
+	border-radius: 50%;
+	width: 45px;
+	height: 45px;
+	animation: spin 2s linear infinite;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin-left: -30px;
+	margin-top: -30px;
+	transform: translate(-50%, -50%);
+
+}
+
+@keyframes spin {
+	0% {
+		transform: rotate(0deg);
+	}
+
+	100% {
+		transform: rotate(360deg);
+	}
+}
+
+/* end */
+/* 地图信息窗口样式 */
+.textoverflow {
+	width: 100%;
+
+	line-height: 23px;
+}
+
+.imgs {
+	width: 100%;
+	height: auto;
+	max-height: 150px;
+}
+
+.infoWindow-title {
+	width: 100%;
+
+	font-size: 16px;
+	font-weight: 600;
+	line-height: 22px;
+
+}
+
+/* end */
+#slider {
+	width: 96%;
+	margin-left: 2%;
+
+	background-color: #fff;
+	position: fixed;
+	left: 0;
+	bottom: 10px;
+	z-index: 100;
+	border-radius: 6px;
+	padding: 20px 15px;
+	box-sizing: border-box;
+
+}
+
+.slider-title {
+	width: 100%;
+	font-size: 15px;
+	font-weight: 500;
+
+
+}
+
+.slider-box {
+	width: 100%;
+	padding: 0 10p x 0 0;
+	box-sizing: border-box;
+	margin-top: 20px;
+	display: flex;
+	align-items: center;
+
+}
+
+.slider-btn {
+	width: 100%;
+	height: 40px;
+	color: #fff;
+	background-color: darkcyan;
+	font-size: 15px;
+	font-weight: 500;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 5px;
+	margin-top: 30px;
+}
+
+.custom-button {
+	width: 26px;
+	color: #fff;
+	font-size: 12px;
+	font-weight: 500;
+	line-height: 25px;
+	text-align: center;
+	background-color: darkcyan;
+	border-radius: 100px;
+}
+
+#search-box {
+	height: 30px;
+	width: 93%;
+	position: fixed;
+	padding: 5px;
+	font-size: 16px;
+	border-radius: 4px;
+	border: 1px solid #ccc;
+	box-shadow: 0px 1px 3px #ddd;
+	left: 2%;
+	top: 80px;
+	font-size: 12px;
+}
+
+/* 定位图标 */
+.pos {
+	width: 36px;
+	height: 36px;
+	position: fixed;
+	right: 10px;
+	bottom: 250px;
+	z-index: 100;
+	padding: 6px;
+	box-sizing: border-box;
+	border-radius: 5px;
+	background-color: #fff;
+}
+.citys {
+	width: 96%;
+	position: fixed;
+	font-size: 16px;
+	left: 2%;
+	top: 130px;
+	font-size: 12px;
+	background-color: #fff;
+	padding: 5px 10px;
+	box-sizing: border-box;
+	border-radius: 5px;
+}

msdYongHu/unpackage/cache/wgt/__UNI__F607D49/hybrid/html/maps/css/modules/code.css

@@ -0,0 +1 @@
+html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-view{display:block;position:relative;margin:10px 0;padding:0;border:1px solid #eee;border-left-width:6px;background-color:#fafafa;color:#333;font-family:Courier New;font-size:13px}.layui-code-title{position:relative;padding:0 10px;height:40px;line-height:40px;border-bottom:1px solid #eee;font-size:12px}.layui-code-title>.layui-code-about{position:absolute;right:10px;top:0;color:#b7b7b7}.layui-code-about>a{padding-left:10px}.layui-code-view>.layui-code-ol,.layui-code-view>.layui-code-ul{position:relative;overflow:auto}.layui-code-view>.layui-code-ol>li{position:relative;margin-left:45px;line-height:20px;padding:0 10px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view>.layui-code-ol>li:first-child,.layui-code-view>.layui-code-ul>li:first-child{padding-top:10px}.layui-code-view>.layui-code-ol>li:last-child,.layui-code-view>.layui-code-ul>li:last-child{padding-bottom:10px}.layui-code-view>.layui-code-ul>li{position:relative;line-height:20px;padding:0 10px;list-style-type:none;*list-style-type:none;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-dark{border:1px solid #0c0c0c;border-left-color:#3f3f3f;background-color:#0c0c0c;color:#c2be9e}.layui-code-dark>.layui-code-title{border-bottom:none}.layui-code-dark>.layui-code-ol>li,.layui-code-dark>.layui-code-ul>li{background-color:#3f3f3f;border-left:none}.layui-code-dark>.layui-code-ul>li{margin-left:6px}.layui-code-demo .layui-code{visibility:visible!important;margin:-15px;border-top:none;border-right:none;border-bottom:none}.layui-code-demo .layui-tab-content{padding:15px;border-top:none}

msdYongHu/unpackage/cache/wgt/__UNI__F607D49/hybrid/html/maps/js/lib/city.js

@@ -0,0 +1,1104 @@
+var cityArr = [
+	[
+		[113.631683, 34.766461],
+		[113.631493, 34.766214],
+		[113.631206, 34.765443],
+		[113.631135, 34.764565],
+		[113.629877, 34.760791],
+		[113.629858, 34.760548],
+		[113.628865, 34.757271],
+		[113.628885, 34.757173],
+		[113.628207, 34.75494],
+		[113.628336, 34.75464],
+		[113.628877, 34.754559],
+		[113.632646, 34.754195],
+		[113.632646, 34.748388],
+		[113.629856, 34.748396],
+		[113.629648, 34.748177],
+		[113.628111, 34.748233],
+		[113.628168, 34.747357],
+		[113.628111, 34.747295],
+		[113.628128, 34.744636],
+		[113.628075, 34.742891],
+		[113.628092, 34.739063],
+		[113.627832, 34.738785],
+		[113.626073, 34.737594],
+		[113.625458, 34.737044],
+		[113.625288, 34.736645],
+		[113.62499, 34.735003],
+		[113.624114, 34.732545],
+		[113.623589, 34.730981],
+		[113.622339, 34.728215],
+		[113.622179, 34.727586],
+		[113.621745, 34.722947],
+		[113.621609, 34.720152],
+		[113.62152, 34.719806],
+		[113.621315, 34.719665],
+		[113.620744, 34.719637],
+		[113.620682, 34.719439],
+		[113.62069, 34.716988],
+		[113.620828, 34.711984],
+		[113.62074, 34.712305],
+		[113.616795, 34.712387],
+		[113.61575, 34.710532],
+		[113.616838, 34.710591],
+		[113.617074, 34.710099],
+		[113.615588, 34.710021],
+		[113.61537, 34.709961],
+		[113.614199, 34.709926],
+		[113.613063, 34.709775],
+		[113.612829, 34.708557],
+		[113.613671, 34.707152],
+		[113.610734, 34.706881],
+		[113.609829, 34.706658],
+		[113.608224, 34.706452],
+		[113.607389, 34.704688],
+		[113.606157, 34.704815],
+		[113.60162, 34.704915],
+		[113.601132, 34.704976],
+		[113.600857, 34.705118],
+		[113.600664, 34.705563],
+		[113.600552, 34.706605],
+		[113.600404, 34.706974],
+		[113.600084, 34.707259],
+		[113.599676, 34.70741],
+		[113.59912, 34.707459],
+		[113.594411, 34.707332],
+		[113.592235, 34.707334],
+		[113.589581, 34.707502],
+		[113.589114, 34.707553],
+		[113.588264, 34.707763],
+		[113.587734, 34.708214],
+		[113.587553, 34.708811],
+		[113.587353, 34.71019],
+		[113.587024, 34.710641],
+		[113.586436, 34.711197],
+		[113.586262, 34.711515],
+		[113.586209, 34.711917],
+		[113.5862, 34.713282],
+		[113.585854, 34.713561],
+		[113.58509, 34.713438],
+		[113.584312, 34.713446],
+		[113.583921, 34.713533],
+		[113.580514, 34.714686],
+		[113.579866, 34.714859],
+		[113.5716, 34.716309],
+		[113.570214, 34.716446],
+		[113.568863, 34.716334],
+		[113.565763, 34.715707],
+		[113.565208, 34.715922],
+		[113.564091, 34.717555],
+		[113.563633, 34.717657],
+		[113.563563, 34.717442],
+		[113.563614, 34.716769],
+		[113.562583, 34.712566],
+		[113.562272, 34.712034],
+		[113.561831, 34.711711],
+		[113.5606, 34.711307],
+		[113.557571, 34.707848],
+		[113.557216, 34.707142],
+		[113.556843, 34.705519],
+		[113.556445, 34.704692],
+		[113.556082, 34.704351],
+		[113.554056, 34.702875],
+		[113.553667, 34.702537],
+		[113.553373, 34.702123],
+		[113.552627, 34.70072],
+		[113.552385, 34.70043],
+		[113.551798, 34.700271],
+		[113.551502, 34.70037],
+		[113.550033, 34.701585],
+		[113.549522, 34.70173],
+		[113.549279, 34.701605],
+		[113.549166, 34.701327],
+		[113.549305, 34.699319],
+		[113.549131, 34.699034],
+		[113.546587, 34.698547],
+		[113.542313, 34.70158],
+		[113.541934, 34.703698],
+		[113.54227, 34.705968],
+		[113.542349, 34.708364],
+		[113.541094, 34.708989],
+		[113.537366, 34.709618],
+		[113.534529, 34.714445],
+		[113.533889, 34.717165],
+		[113.531987, 34.717765],
+		[113.526763, 34.717931],
+		[113.525389, 34.718905],
+		[113.52538, 34.719773],
+		[113.524212, 34.720329],
+		[113.522793, 34.720019],
+		[113.519776, 34.718507],
+		[113.517597, 34.717975],
+		[113.515106, 34.715288],
+		[113.512894, 34.712832],
+		[113.511164, 34.710214],
+		[113.50978, 34.707642],
+		[113.508949, 34.704785],
+		[113.507911, 34.700316],
+		[113.507563, 34.696483],
+		[113.506942, 34.692996],
+		[113.50638, 34.689333],
+		[113.507131, 34.687209],
+		[113.507892, 34.685382],
+		[113.508723, 34.682396],
+		[113.508651, 34.68085],
+		[113.507761, 34.678853],
+		[113.506647, 34.676453],
+		[113.506162, 34.674679],
+		[113.505814, 34.672964],
+		[113.506646, 34.671122],
+		[113.507613, 34.669575],
+		[113.507683, 34.667804],
+		[113.506151, 34.665342],
+		[113.506635, 34.665234],
+		[113.509541, 34.663727],
+		[113.511746, 34.661948],
+		[113.513605, 34.660168],
+		[113.514226, 34.658847],
+		[113.514226, 34.65736],
+		[113.51388, 34.65421],
+		[113.514572, 34.652147],
+		[113.514285, 34.650206],
+		[113.512851, 34.649294],
+		[113.511112, 34.649127],
+		[113.507871, 34.649022],
+		[113.504688, 34.64806],
+		[113.504422, 34.64737],
+		[113.506072, 34.646448],
+		[113.510083, 34.645579],
+		[113.513326, 34.644763],
+		[113.516015, 34.644302],
+		[113.517053, 34.643952],
+		[113.516913, 34.64298],
+		[113.516015, 34.641378],
+		[113.515185, 34.64058],
+		[113.514562, 34.639097],
+		[113.514908, 34.637778],
+		[113.515867, 34.636512],
+		[113.517042, 34.635538],
+		[113.518626, 34.634792],
+		[113.520908, 34.634547],
+		[113.523261, 34.634542],
+		[113.526642, 34.634239],
+		[113.528847, 34.634401],
+		[113.527603, 34.632296],
+		[113.526219, 34.630694],
+		[113.525733, 34.629092],
+		[113.525396, 34.628179],
+		[113.526771, 34.627198],
+		[113.527947, 34.626855],
+		[113.530221, 34.626677],
+		[113.53208, 34.626325],
+		[113.534572, 34.626026],
+		[113.536777, 34.624991],
+		[113.538647, 34.622806],
+		[113.53933, 34.621772],
+		[113.539397, 34.620969],
+		[113.539122, 34.619777],
+		[113.538836, 34.618339],
+		[113.538359, 34.617089],
+		[113.538419, 34.61548],
+		[113.539251, 34.614848],
+		[113.541327, 34.613807],
+		[113.542917, 34.613809],
+		[113.544086, 34.614254],
+		[113.545195, 34.61517],
+		[113.546639, 34.61677],
+		[113.547885, 34.618198],
+		[113.549002, 34.621576],
+		[113.549279, 34.623632],
+		[113.549627, 34.625523],
+		[113.550319, 34.627749],
+		[113.551703, 34.629866],
+		[113.55302, 34.632036],
+		[113.554333, 34.633979],
+		[113.556273, 34.635283],
+		[113.557996, 34.635571],
+		[113.559865, 34.635841],
+		[113.561182, 34.635668],
+		[113.563114, 34.633833],
+		[113.564014, 34.632404],
+		[113.564835, 34.630969],
+		[113.567112, 34.628725],
+		[113.568837, 34.627406],
+		[113.570629, 34.625688],
+		[113.571391, 34.624255],
+		[113.572292, 34.622015],
+		[113.572707, 34.619617],
+		[113.572629, 34.617723],
+		[113.572006, 34.616241],
+		[113.570619, 34.614638],
+		[113.570064, 34.612921],
+		[113.570125, 34.610916],
+		[113.57172, 34.609311],
+		[113.573442, 34.607189],
+		[113.574333, 34.60627],
+		[113.575235, 34.605582],
+		[113.576969, 34.60512],
+		[113.57911, 34.604997],
+		[113.579941, 34.604536],
+		[113.582012, 34.603506],
+		[113.584021, 34.602761],
+		[113.586224, 34.603441],
+		[113.588513, 34.603834],
+		[113.590039, 34.603313],
+		[113.592942, 34.60251],
+		[113.595017, 34.602395],
+		[113.596196, 34.602791],
+		[113.597645, 34.603759],
+		[113.59917, 34.604047],
+		[113.601036, 34.604042],
+		[113.601799, 34.603121],
+		[113.601938, 34.60192],
+		[113.601792, 34.600659],
+		[113.602007, 34.600034],
+		[113.603179, 34.600547],
+		[113.604289, 34.601519],
+		[113.60547, 34.602663],
+		[113.606443, 34.603233],
+		[113.607822, 34.604376],
+		[113.608247, 34.606036],
+		[113.607553, 34.607186],
+		[113.605895, 34.607869],
+		[113.600499, 34.608625],
+		[113.599258, 34.609718],
+		[113.598981, 34.611082],
+		[113.599535, 34.612581],
+		[113.600647, 34.613771],
+		[113.601966, 34.615546],
+		[113.602382, 34.617089],
+		[113.602105, 34.618588],
+		[113.601143, 34.619783],
+		[113.600516, 34.623046],
+		[113.601637, 34.625391],
+		[113.603432, 34.627631],
+		[113.606142, 34.629395],
+		[113.607875, 34.629443],
+		[113.609405, 34.629043],
+		[113.611338, 34.627275],
+		[113.611956, 34.626186],
+		[113.61501, 34.625493],
+		[113.617015, 34.625771],
+		[113.618883, 34.626059],
+		[113.62062, 34.626915],
+		[113.621663, 34.627831],
+		[113.622706, 34.629496],
+		[113.622914, 34.631666],
+		[113.622854, 34.634985],
+		[113.622792, 34.636764],
+		[113.622862, 34.638194],
+		[113.623696, 34.638481],
+		[113.625085, 34.638762],
+		[113.626259, 34.638595],
+		[113.627927, 34.638299],
+		[113.632356, 34.637784],
+		[113.634094, 34.637839],
+		[113.636526, 34.638822],
+		[113.638404, 34.639788],
+		[113.640759, 34.641106],
+		[113.642358, 34.641218],
+		[113.644305, 34.641213],
+		[113.646383, 34.641096],
+		[113.648947, 34.640758],
+		[113.650894, 34.640189],
+		[113.652285, 34.639386],
+		[113.653666, 34.639042],
+		[113.655189, 34.639093],
+		[113.657206, 34.639321],
+		[113.658945, 34.639836],
+		[113.660544, 34.640699],
+		[113.662832, 34.642475],
+		[113.664057, 34.643516],
+		[113.663214, 34.645447],
+		[113.660484, 34.6463],
+		[113.662363, 34.648941],
+		[113.667145, 34.653972],
+		[113.66625, 34.656271],
+		[113.661589, 34.657275],
+		[113.655451, 34.659506],
+		[113.653044, 34.661863],
+		[113.653156, 34.665337],
+		[113.65539, 34.667172],
+		[113.65953, 34.668144],
+		[113.661007, 34.671446],
+		[113.664608, 34.678014],
+		[113.668392, 34.68207],
+		[113.670922, 34.686777],
+		[113.67507, 34.687892],
+		[113.675802, 34.69671],
+		[113.675229, 34.699284],
+		[113.673349, 34.699778],
+		[113.670541, 34.70049],
+		[113.669586, 34.702019],
+		[113.669672, 34.704723],
+		[113.673908, 34.708573],
+		[113.676411, 34.710117],
+		[113.676552, 34.714616],
+		[113.674005, 34.720109],
+		[113.670283, 34.726879],
+		[113.665971, 34.734431],
+		[113.665257, 34.736635],
+		[113.665119, 34.736848],
+		[113.667734, 34.73874],
+		[113.66771, 34.739233],
+		[113.668032, 34.739326],
+		[113.667949, 34.740447],
+		[113.667388, 34.740392],
+		[113.666617, 34.742058],
+		[113.666391, 34.742141],
+		[113.665493, 34.741709],
+		[113.66452, 34.741461],
+		[113.664093, 34.74255],
+		[113.663963, 34.743643],
+		[113.664694, 34.743821],
+		[113.66552, 34.744307],
+		[113.666452, 34.744554],
+		[113.666512, 34.744653],
+		[113.666529, 34.74674],
+		[113.66672, 34.747736],
+		[113.666903, 34.748032],
+		[113.668094, 34.748502],
+		[113.669445, 34.748692],
+		[113.669526, 34.751476],
+		[113.669481, 34.751576],
+		[113.668111, 34.751802],
+		[113.667025, 34.752287],
+		[113.66673, 34.752497],
+		[113.666617, 34.752799],
+		[113.666693, 34.753586],
+		[113.666904, 34.754427],
+		[113.666827, 34.755312],
+		[113.667001, 34.75608],
+		[113.665627, 34.756373],
+		[113.665321, 34.756797],
+		[113.662272, 34.757863],
+		[113.66026, 34.758383],
+		[113.660217, 34.759303],
+		[113.661169, 34.759344],
+		[113.661062, 34.760425],
+		[113.661029, 34.761295],
+		[113.661429, 34.761127],
+		[113.66205, 34.760999],
+		[113.662684, 34.758756],
+		[113.664283, 34.758315],
+		[113.664436, 34.759231],
+		[113.665233, 34.760768],
+		[113.665271, 34.763483],
+		[113.664553, 34.763546],
+		[113.662971, 34.763814],
+		[113.662954, 34.764218],
+		[113.659651, 34.764176],
+		[113.658165, 34.764174],
+		[113.657409, 34.764023],
+		[113.656687, 34.763579],
+		[113.655938, 34.76333],
+		[113.655081, 34.762911],
+		[113.654213, 34.762128],
+		[113.652755, 34.760014],
+		[113.652531, 34.75986],
+		[113.651638, 34.758318],
+		[113.645064, 34.759777],
+		[113.644274, 34.759999],
+		[113.643692, 34.760265],
+		[113.643301, 34.76061],
+		[113.63926, 34.766352],
+		[113.637755, 34.765835],
+		[113.637115, 34.765796],
+		[113.63249, 34.766386],
+		[113.631683, 34.766461]
+	],
+	[
+		[113.845063, 34.746141],
+		[113.842337, 34.746668],
+		[113.838943, 34.748032],
+		[113.835423, 34.751599],
+		[113.833044, 34.756248],
+		[113.830603, 34.757305],
+		[113.8222, 34.758942],
+		[113.818954, 34.759705],
+		[113.816583, 34.761645],
+		[113.817145, 34.765164],
+		[113.817034, 34.768043],
+		[113.813795, 34.768866],
+		[113.807788, 34.768331],
+		[113.800817, 34.766566],
+		[113.793379, 34.765379],
+		[113.790485, 34.763199],
+		[113.7889, 34.756143],
+		[113.786447, 34.751614],
+		[113.78189, 34.751265],
+		[113.779413, 34.753264],
+		[113.779239, 34.756374],
+		[113.774569, 34.758819],
+		[113.765151, 34.760605],
+		[113.761701, 34.760314],
+		[113.758829, 34.756933],
+		[113.75844, 34.756157],
+		[113.757469, 34.755301],
+		[113.757053, 34.755041],
+		[113.756635, 34.754963],
+		[113.755057, 34.754956],
+		[113.753417, 34.754812],
+		[113.752081, 34.754531],
+		[113.751613, 34.754326],
+		[113.749608, 34.753042],
+		[113.745545, 34.750775],
+		[113.744703, 34.750233],
+		[113.743871, 34.749621],
+		[113.737316, 34.744604],
+		[113.736526, 34.743906],
+		[113.736204, 34.743438],
+		[113.736003, 34.742902],
+		[113.735527, 34.741364],
+		[113.735265, 34.740858],
+		[113.734249, 34.739082],
+		[113.734014, 34.73854],
+		[113.733598, 34.737067],
+		[113.733354, 34.736777],
+		[113.732538, 34.736244],
+		[113.730437, 34.735149],
+		[113.729655, 34.734874],
+		[113.728761, 34.734842],
+		[113.727901, 34.735001],
+		[113.727093, 34.735363],
+		[113.726311, 34.735342],
+		[113.726348, 34.737886],
+		[113.723068, 34.737882],
+		[113.720638, 34.737832],
+		[113.720708, 34.739321],
+		[113.712267, 34.738883],
+		[113.712307, 34.735548],
+		[113.710463, 34.735163],
+		[113.710441, 34.737173],
+		[113.71036, 34.737542],
+		[113.710302, 34.738782],
+		[113.705473, 34.738531],
+		[113.705351, 34.737729],
+		[113.704123, 34.737682],
+		[113.703936, 34.739238],
+		[113.703925, 34.740128],
+		[113.703995, 34.742198],
+		[113.705752, 34.742455],
+		[113.706429, 34.742871],
+		[113.709098, 34.742766],
+		[113.710421, 34.746894],
+		[113.706056, 34.746933],
+		[113.703623, 34.746917],
+		[113.70298, 34.755799],
+		[113.70285, 34.756537],
+		[113.702545, 34.756967],
+		[113.702094, 34.757109],
+		[113.700041, 34.756983],
+		[113.69973, 34.756782],
+		[113.697573, 34.757123],
+		[113.697381, 34.755422],
+		[113.69437, 34.755397],
+		[113.694277, 34.755329],
+		[113.693282, 34.755377],
+		[113.691451, 34.755296],
+		[113.69146, 34.754044],
+		[113.690269, 34.753971],
+		[113.683531, 34.75567],
+		[113.681748, 34.756064],
+		[113.680052, 34.756388],
+		[113.677296, 34.756878],
+		[113.674209, 34.757375],
+		[113.67393, 34.757401],
+		[113.67339, 34.757211],
+		[113.671131, 34.755444],
+		[113.670887, 34.755305],
+		[113.67053, 34.755417],
+		[113.670373, 34.755836],
+		[113.670504, 34.756124],
+		[113.671296, 34.75707],
+		[113.671427, 34.757386],
+		[113.671366, 34.757688],
+		[113.671131, 34.757923],
+		[113.670695, 34.757805],
+		[113.669633, 34.75699],
+		[113.669095, 34.756881],
+		[113.668695, 34.75702],
+		[113.667591, 34.757672],
+		[113.66721, 34.757738],
+		[113.667234, 34.757409],
+		[113.667852, 34.756796],
+		[113.667939, 34.756543],
+		[113.667678, 34.756282],
+		[113.667001, 34.756081],
+		[113.666827, 34.755313],
+		[113.666905, 34.754427],
+		[113.666692, 34.753586],
+		[113.666618, 34.7528],
+		[113.666731, 34.752496],
+		[113.667025, 34.752287],
+		[113.668111, 34.751803],
+		[113.669481, 34.751575],
+		[113.669526, 34.751476],
+		[113.669444, 34.748691],
+		[113.668094, 34.748503],
+		[113.666903, 34.748032],
+		[113.66672, 34.747735],
+		[113.666529, 34.74674],
+		[113.666511, 34.744652],
+		[113.66645, 34.744554],
+		[113.665521, 34.744307],
+		[113.664693, 34.743821],
+		[113.663964, 34.743643],
+		[113.664092, 34.74255],
+		[113.664519, 34.741461],
+		[113.665494, 34.74171],
+		[113.666391, 34.742142],
+		[113.666616, 34.742059],
+		[113.667388, 34.740392],
+		[113.66795, 34.740447],
+		[113.668033, 34.739325],
+		[113.667711, 34.739234],
+		[113.667735, 34.73874],
+		[113.66512, 34.736849],
+		[113.665257, 34.736634],
+		[113.665971, 34.734431],
+		[113.670284, 34.726879],
+		[113.674004, 34.72011],
+		[113.676551, 34.714616],
+		[113.676412, 34.710118],
+		[113.673909, 34.708572],
+		[113.669672, 34.704725],
+		[113.669585, 34.702019],
+		[113.670541, 34.700491],
+		[113.673349, 34.699778],
+		[113.675228, 34.699284],
+		[113.675803, 34.69671],
+		[113.675071, 34.687892],
+		[113.670922, 34.686777],
+		[113.668392, 34.68207],
+		[113.664608, 34.678014],
+		[113.661008, 34.671447],
+		[113.659529, 34.668143],
+		[113.655391, 34.667172],
+		[113.653157, 34.665337],
+		[113.653044, 34.661864],
+		[113.655452, 34.659506],
+		[113.661589, 34.657275],
+		[113.66625, 34.656271],
+		[113.667147, 34.653973],
+		[113.662364, 34.648941],
+		[113.660485, 34.646299],
+		[113.663213, 34.645446],
+		[113.664058, 34.643516],
+		[113.664371, 34.643785],
+		[113.666241, 34.644473],
+		[113.667284, 34.644016],
+		[113.668457, 34.642759],
+		[113.669154, 34.641618],
+		[113.670266, 34.640521],
+		[113.672822, 34.638984],
+		[113.673996, 34.638124],
+		[113.675874, 34.635947],
+		[113.678787, 34.634057],
+		[113.681003, 34.633372],
+		[113.682665, 34.633427],
+		[113.684613, 34.634113],
+		[113.685658, 34.634857],
+		[113.687029, 34.636931],
+		[113.689735, 34.635289],
+		[113.692317, 34.637618],
+		[113.692779, 34.638422],
+		[113.692613, 34.641265],
+		[113.691338, 34.642137],
+		[113.691597, 34.643185],
+		[113.69257, 34.644066],
+		[113.692901, 34.644472],
+		[113.692596, 34.644779],
+		[113.691814, 34.645301],
+		[113.692222, 34.646028],
+		[113.693188, 34.645958],
+		[113.693952, 34.646012],
+		[113.694379, 34.646299],
+		[113.694466, 34.646798],
+		[113.694074, 34.647031],
+		[113.69358, 34.64719],
+		[113.693545, 34.647562],
+		[113.694022, 34.648117],
+		[113.695126, 34.648209],
+		[113.695938, 34.647784],
+		[113.696482, 34.64764],
+		[113.69697, 34.648086],
+		[113.696275, 34.649299],
+		[113.695944, 34.652111],
+		[113.698056, 34.651403],
+		[113.702569, 34.649678],
+		[113.704924, 34.649044],
+		[113.70888, 34.647896],
+		[113.711643, 34.646011],
+		[113.713093, 34.644348],
+		[113.714347, 34.644007],
+		[113.716284, 34.643774],
+		[113.717882, 34.643137],
+		[113.719264, 34.642224],
+		[113.720575, 34.641131],
+		[113.721063, 34.639358],
+		[113.722018, 34.637415],
+		[113.722774, 34.633806],
+		[113.723599, 34.630716],
+		[113.724076, 34.62911],
+		[113.724831, 34.627903],
+		[113.725804, 34.626934],
+		[113.730095, 34.625664],
+		[113.731693, 34.625549],
+		[113.735159, 34.625427],
+		[113.737303, 34.625371],
+		[113.740072, 34.625248],
+		[113.742295, 34.624666],
+		[113.743329, 34.624158],
+		[113.744084, 34.623297],
+		[113.745887, 34.622262],
+		[113.74969, 34.619849],
+		[113.751761, 34.61789],
+		[113.753759, 34.616169],
+		[113.754998, 34.614745],
+		[113.756655, 34.613482],
+		[113.757756, 34.613012],
+		[113.758945, 34.613528],
+		[113.7595, 34.614497],
+		[113.760332, 34.616332],
+		[113.760898, 34.618218],
+		[113.76139, 34.619534],
+		[113.761947, 34.620901],
+		[113.762918, 34.621988],
+		[113.764862, 34.622727],
+		[113.766109, 34.622896],
+		[113.768114, 34.622769],
+		[113.768876, 34.622311],
+		[113.770322, 34.621565],
+		[113.772039, 34.62064],
+		[113.773426, 34.620236],
+		[113.775845, 34.619827],
+		[113.777994, 34.6193],
+		[113.779927, 34.619012],
+		[113.781305, 34.618542],
+		[113.782483, 34.618378],
+		[113.7838, 34.618715],
+		[113.785315, 34.619334],
+		[113.786632, 34.619671],
+		[113.788088, 34.619558],
+		[113.789196, 34.619152],
+		[113.791543, 34.619877],
+		[113.792566, 34.621648],
+		[113.790723, 34.622975],
+		[113.790115, 34.625376],
+		[113.789995, 34.630702],
+		[113.78912, 34.635921],
+		[113.789623, 34.640326],
+		[113.790672, 34.643639],
+		[113.791728, 34.647066],
+		[113.793185, 34.649636],
+		[113.794648, 34.652036],
+		[113.796148, 34.653994],
+		[113.79841, 34.657669],
+		[113.802696, 34.65867],
+		[113.80636, 34.661676],
+		[113.809083, 34.662051],
+		[113.810303, 34.661425],
+		[113.81032, 34.649516],
+		[113.812379, 34.649309],
+		[113.813168, 34.649265],
+		[113.816207, 34.649019],
+		[113.816908, 34.650506],
+		[113.816986, 34.652507],
+		[113.816995, 34.655533],
+		[113.816945, 34.659896],
+		[113.816625, 34.663898],
+		[113.815456, 34.667334],
+		[113.815889, 34.671455],
+		[113.816453, 34.674317],
+		[113.817855, 34.677341],
+		[113.82181, 34.680471],
+		[113.825202, 34.682803],
+		[113.827843, 34.685764],
+		[113.829419, 34.687273],
+		[113.835819, 34.699649],
+		[113.835993, 34.701664],
+		[113.851294, 34.701122],
+		[113.859732, 34.701296],
+		[113.8623, 34.706665],
+		[113.863522, 34.714437],
+		[113.866104, 34.714406],
+		[113.866903, 34.72262],
+		[113.870743, 34.731437],
+		[113.867462, 34.731984],
+		[113.854431, 34.734131],
+		[113.85061, 34.736086],
+		[113.847, 34.740478],
+		[113.845496, 34.744942],
+		[113.845063, 34.746141]
+	],
+	[
+		[113.667, 34.756081],
+		[113.667677, 34.756281],
+		[113.66794, 34.756544],
+		[113.667853, 34.756796],
+		[113.667234, 34.75741],
+		[113.66721, 34.757738],
+		[113.66759, 34.757673],
+		[113.668695, 34.757021],
+		[113.669097, 34.75688],
+		[113.669633, 34.756991],
+		[113.670696, 34.757804],
+		[113.671131, 34.757923],
+		[113.671365, 34.757688],
+		[113.671428, 34.757386],
+		[113.671297, 34.757071],
+		[113.670504, 34.756124],
+		[113.670373, 34.755836],
+		[113.67053, 34.755418],
+		[113.670887, 34.755305],
+		[113.671131, 34.755444],
+		[113.673391, 34.757211],
+		[113.673929, 34.757401],
+		[113.67421, 34.757375],
+		[113.677297, 34.756877],
+		[113.680053, 34.756387],
+		[113.681748, 34.756064],
+		[113.68353, 34.75567],
+		[113.690268, 34.753971],
+		[113.69146, 34.754045],
+		[113.691452, 34.755296],
+		[113.693281, 34.755377],
+		[113.694276, 34.755329],
+		[113.69437, 34.755397],
+		[113.697381, 34.755423],
+		[113.697573, 34.757123],
+		[113.69973, 34.756781],
+		[113.700042, 34.756982],
+		[113.702092, 34.757108],
+		[113.702546, 34.756967],
+		[113.702851, 34.756536],
+		[113.70298, 34.755798],
+		[113.703623, 34.746918],
+		[113.706056, 34.746933],
+		[113.710421, 34.746894],
+		[113.709098, 34.742766],
+		[113.706428, 34.742871],
+		[113.705751, 34.742455],
+		[113.703995, 34.742198],
+		[113.703924, 34.740129],
+		[113.703938, 34.739238],
+		[113.704124, 34.737683],
+		[113.705352, 34.737729],
+		[113.705473, 34.738532],
+		[113.710302, 34.738782],
+		[113.71036, 34.737541],
+		[113.710442, 34.737173],
+		[113.710463, 34.735164],
+		[113.712308, 34.735547],
+		[113.712268, 34.738883],
+		[113.720707, 34.739321],
+		[113.720636, 34.737831],
+		[113.723066, 34.737883],
+		[113.72635, 34.737887],
+		[113.726311, 34.735343],
+		[113.727093, 34.735363],
+		[113.727901, 34.735001],
+		[113.728759, 34.734842],
+		[113.729655, 34.734874],
+		[113.730437, 34.735149],
+		[113.732539, 34.736245],
+		[113.733355, 34.736776],
+		[113.733597, 34.737067],
+		[113.734014, 34.738541],
+		[113.73425, 34.739083],
+		[113.735266, 34.740858],
+		[113.735526, 34.741365],
+		[113.736004, 34.742901],
+		[113.736206, 34.743437],
+		[113.736526, 34.743905],
+		[113.737316, 34.744604],
+		[113.74387, 34.749621],
+		[113.744702, 34.750234],
+		[113.745545, 34.750774],
+		[113.749608, 34.753043],
+		[113.751613, 34.754325],
+		[113.75208, 34.754532],
+		[113.753416, 34.754811],
+		[113.755056, 34.754956],
+		[113.756634, 34.754962],
+		[113.757051, 34.755041],
+		[113.757469, 34.7553],
+		[113.75844, 34.756158],
+		[113.758831, 34.756932],
+		[113.7617, 34.760314],
+		[113.765151, 34.760605],
+		[113.774569, 34.758818],
+		[113.779241, 34.756373],
+		[113.779411, 34.753263],
+		[113.781889, 34.751266],
+		[113.786445, 34.751613],
+		[113.7889, 34.756143],
+		[113.790485, 34.763199],
+		[113.793377, 34.76538],
+		[113.800816, 34.766566],
+		[113.807787, 34.768331],
+		[113.813795, 34.768865],
+		[113.817034, 34.768043],
+		[113.817144, 34.765165],
+		[113.816582, 34.761645],
+		[113.818953, 34.759704],
+		[113.822199, 34.75894],
+		[113.830601, 34.757305],
+		[113.833042, 34.756247],
+		[113.835423, 34.751598],
+		[113.838945, 34.748033],
+		[113.842336, 34.746667],
+		[113.845063, 34.746142],
+		[113.844457, 34.747956],
+		[113.84405, 34.750078],
+		[113.844761, 34.752649],
+		[113.845601, 34.756425],
+		[113.846596, 34.760143],
+		[113.848344, 34.764195],
+		[113.849541, 34.768194],
+		[113.849628, 34.77346],
+		[113.848822, 34.777819],
+		[113.846, 34.781724],
+		[113.843517, 34.784139],
+		[113.841596, 34.786615],
+		[113.839667, 34.788393],
+		[113.838578, 34.791263],
+		[113.838593, 34.794818],
+		[113.838751, 34.799227],
+		[113.838155, 34.804383],
+		[113.838795, 34.807009],
+		[113.839627, 34.80912],
+		[113.840536, 34.810719],
+		[113.841236, 34.812153],
+		[113.84, 34.8145],
+		[113.839601, 34.816964],
+		[113.839748, 34.819422],
+		[113.840588, 34.820562],
+		[113.843079, 34.822213],
+		[113.845591, 34.824486],
+		[113.845806, 34.825917],
+		[113.845192, 34.827354],
+		[113.842509, 34.830347],
+		[113.841402, 34.831665],
+		[113.840509, 34.833791],
+		[113.840727, 34.835502],
+		[113.841638, 34.838079],
+		[113.843334, 34.842764],
+		[113.844874, 34.846991],
+		[113.845575, 34.849958],
+		[113.846769, 34.852364],
+		[113.848231, 34.853608],
+		[113.849688, 34.854292],
+		[113.852179, 34.854511],
+		[113.853575, 34.855135],
+		[113.854958, 34.855983],
+		[113.85573, 34.857182],
+		[113.856145, 34.859061],
+		[113.8572, 34.859978],
+		[113.858932, 34.860654],
+		[113.861158, 34.861562],
+		[113.862819, 34.862638],
+		[113.864499, 34.864172],
+		[113.865746, 34.865488],
+		[113.866239, 34.867373],
+		[113.866389, 34.870062],
+		[113.86683, 34.873091],
+		[113.868024, 34.877383],
+		[113.870156, 34.885652],
+		[113.86484, 34.88483],
+		[113.841536, 34.879669],
+		[113.83799, 34.879079],
+		[113.826045, 34.877701],
+		[113.811262, 34.879],
+		[113.800467, 34.879942],
+		[113.795635, 34.882333],
+		[113.795469, 34.877478],
+		[113.801488, 34.871976],
+		[113.801322, 34.86708],
+		[113.797684, 34.865685],
+		[113.789102, 34.860424],
+		[113.783254, 34.858513],
+		[113.77892, 34.86101],
+		[113.767834, 34.867651],
+		[113.74297, 34.867303],
+		[113.71482, 34.868817],
+		[113.709988, 34.8647],
+		[113.705365, 34.858755],
+		[113.697245, 34.855843],
+		[113.685911, 34.854704],
+		[113.680192, 34.854945],
+		[113.680165, 34.852286],
+		[113.679116, 34.852459],
+		[113.678963, 34.853486],
+		[113.67642, 34.853588],
+		[113.676045, 34.851381],
+		[113.666979, 34.851166],
+		[113.66122, 34.850988],
+		[113.661089, 34.85172],
+		[113.654632, 34.851748],
+		[113.654921, 34.856858],
+		[113.646204, 34.857396],
+		[113.645884, 34.855973],
+		[113.644842, 34.856087],
+		[113.644278, 34.853951],
+		[113.641472, 34.852153],
+		[113.639742, 34.851191],
+		[113.639041, 34.846667],
+		[113.638459, 34.844046],
+		[113.638181, 34.843173],
+		[113.637971, 34.842188],
+		[113.634763, 34.841614],
+		[113.634721, 34.840336],
+		[113.634041, 34.8404],
+		[113.633243, 34.836785],
+		[113.633986, 34.836719],
+		[113.633425, 34.834685],
+		[113.63853, 34.834149],
+		[113.638524, 34.832954],
+		[113.637976, 34.831075],
+		[113.63837, 34.830983],
+		[113.637283, 34.827204],
+		[113.632582, 34.827696],
+		[113.632086, 34.825811],
+		[113.631225, 34.825983],
+		[113.631125, 34.824786],
+		[113.631138, 34.824341],
+		[113.630989, 34.823436],
+		[113.630865, 34.821566],
+		[113.630792, 34.821271],
+		[113.630732, 34.81992],
+		[113.630464, 34.816614],
+		[113.630188, 34.813452],
+		[113.63149, 34.81328],
+		[113.631154, 34.810978],
+		[113.63281, 34.810425],
+		[113.633007, 34.810146],
+		[113.632537, 34.806328],
+		[113.632566, 34.805981],
+		[113.633246, 34.805113],
+		[113.633981, 34.804325],
+		[113.634842, 34.803073],
+		[113.635784, 34.801441],
+		[113.637417, 34.799447],
+		[113.637574, 34.799002],
+		[113.638805, 34.797229],
+		[113.64006, 34.79537],
+		[113.638406, 34.794631],
+		[113.636842, 34.794737],
+		[113.636223, 34.794869],
+		[113.635543, 34.795875],
+		[113.633705, 34.798864],
+		[113.633608, 34.799286],
+		[113.63312, 34.799158],
+		[113.631928, 34.798577],
+		[113.631262, 34.798475],
+		[113.6308, 34.798665],
+		[113.629653, 34.799666],
+		[113.629212, 34.799823],
+		[113.628697, 34.799855],
+		[113.628047, 34.799776],
+		[113.624493, 34.798613],
+		[113.623598, 34.798434],
+		[113.622871, 34.798446],
+		[113.622435, 34.798579],
+		[113.622149, 34.798829],
+		[113.618997, 34.803537],
+		[113.618451, 34.80407],
+		[113.618067, 34.804304],
+		[113.617322, 34.804339],
+		[113.607988, 34.801055],
+		[113.607781, 34.800831],
+		[113.607687, 34.800328],
+		[113.607781, 34.799828],
+		[113.608128, 34.799156],
+		[113.610306, 34.795978],
+		[113.610784, 34.795577],
+		[113.611453, 34.795342],
+		[113.612345, 34.795385],
+		[113.615818, 34.795863],
+		[113.616157, 34.79564],
+		[113.620393, 34.7882],
+		[113.620584, 34.787726],
+		[113.620645, 34.787281],
+		[113.620479, 34.784954],
+		[113.620532, 34.784468],
+		[113.620671, 34.784335],
+		[113.621773, 34.783689],
+		[113.622175, 34.783333],
+		[113.622409, 34.782965],
+		[113.622514, 34.782484],
+		[113.622514, 34.781939],
+		[113.622165, 34.781078],
+		[113.621815, 34.780664],
+		[113.620802, 34.779912],
+		[113.621207, 34.779047],
+		[113.621283, 34.778671],
+		[113.622411, 34.778579],
+		[113.623451, 34.778546],
+		[113.624417, 34.776894],
+		[113.625952, 34.777371],
+		[113.627081, 34.777419],
+		[113.627435, 34.777129],
+		[113.628755, 34.774949],
+		[113.629243, 34.773824],
+		[113.629789, 34.772413],
+		[113.630789, 34.77064],
+		[113.631293, 34.769244],
+		[113.631474, 34.768529],
+		[113.631692, 34.766978],
+		[113.631682, 34.76646],
+		[113.63249, 34.766386],
+		[113.637115, 34.765796],
+		[113.637755, 34.765835],
+		[113.639259, 34.766353],
+		[113.643301, 34.760611],
+		[113.643692, 34.760265],
+		[113.644275, 34.759998],
+		[113.645065, 34.759778],
+		[113.651637, 34.758319],
+		[113.652532, 34.75986],
+		[113.652756, 34.760015],
+		[113.654212, 34.762128],
+		[113.655081, 34.762911],
+		[113.655514, 34.763158],
+		[113.656687, 34.763578],
+		[113.657409, 34.764023],
+		[113.658165, 34.764174],
+		[113.659651, 34.764175],
+		[113.662953, 34.764218],
+		[113.662971, 34.763813],
+		[113.664554, 34.763546],
+		[113.66527, 34.763483],
+		[113.665233, 34.760768],
+		[113.664436, 34.759232],
+		[113.664283, 34.758314],
+		[113.662685, 34.758756],
+		[113.66205, 34.760999],
+		[113.661428, 34.761126],
+		[113.661029, 34.761295],
+		[113.661063, 34.760425],
+		[113.661168, 34.759345],
+		[113.660215, 34.759303],
+		[113.66026, 34.758382],
+		[113.662273, 34.757863],
+		[113.66532, 34.756797],
+		[113.665627, 34.756373],
+		[113.667, 34.756081]
+	]
+
+]
+var cityObjArr = [];
+for (var i = 0; i < cityArr.length; i++) {
+	var arr = [];
+	for (var k = 0; k < cityArr[i].length; k++) {
+		var obj = {
+			lat: cityArr[i][k][1],
+			lng: cityArr[i][k][0]
+		}
+		arr.push(obj)
+	}
+	cityObjArr.push(arr)
+
+}

msdYongHu/unpackage/cache/wgt/__UNI__F607D49/hybrid/html/maps/js/lib/city.json

@@ -0,0 +1,747 @@
+{
+	"type": "FeatureCollection",
+	"features": [{
+		"type": "Feature",
+		"properties": {
+			"adcode": 410182,
+			"name": "荥阳市",
+			"center": [113.391523, 34.789077],
+			"centroid": [113.351681, 34.799765],
+			"childrenNum": 0,
+			"level": "district",
+			"acroutes": [100000, 410000, 410100],
+			"parent": {
+				"adcode": 410100
+			}
+		},
+		"geometry": {
+			"type": "MultiPolygon",
+			"coordinates": [
+				[
+					[
+						[113.272065, 34.723098],
+						[113.272632, 34.721607],
+						[113.271449, 34.720573],
+						[113.270334, 34.719883],
+						[113.26958, 34.71868],
+						[113.26958, 34.717254],
+						[113.270216, 34.715304],
+						[113.269518, 34.713583],
+						[113.267784, 34.7121],
+						[113.266818, 34.710602],
+						[113.265099, 34.705508],
+						[113.263567, 34.702868],
+						[113.261851, 34.700633],
+						[113.260319, 34.698966],
+						[113.259285, 34.696789],
+						[113.259009, 34.694045],
+						[113.260683, 34.691066],
+						[113.262222, 34.68872],
+						[113.263471, 34.686037],
+						[113.263888, 34.684657],
+						[113.26354, 34.682767],
+						[113.262437, 34.681456],
+						[113.26071, 34.680356],
+						[113.256263, 34.679175],
+						[113.255509, 34.678772],
+						[113.255229, 34.678228],
+						[113.254995, 34.677074],
+						[113.254881, 34.675145],
+						[113.255325, 34.673002],
+						[113.256064, 34.671829],
+						[113.256818, 34.671196],
+						[113.258224, 34.67061],
+						[113.259273, 34.669789],
+						[113.260212, 34.668305],
+						[113.261395, 34.666684],
+						[113.261116, 34.6662],
+						[113.261273, 34.665694],
+						[113.262686, 34.664973],
+						[113.263555, 34.66474],
+						[113.263348, 34.663934],
+						[113.262479, 34.663252],
+						[113.262272, 34.662788],
+						[113.263356, 34.661983],
+						[113.260897, 34.658033],
+						[113.25917, 34.654996],
+						[113.256478, 34.650635],
+						[113.253636, 34.648169],
+						[113.251694, 34.646566],
+						[113.250522, 34.64662],
+						[113.249274, 34.648971],
+						[113.24809, 34.648219],
+						[113.246018, 34.646616],
+						[113.244291, 34.64512],
+						[113.242912, 34.643122],
+						[113.242008, 34.641116],
+						[113.242227, 34.639571],
+						[113.241947, 34.638251],
+						[113.239871, 34.638428],
+						[113.236957, 34.639045],
+						[113.235225, 34.639739],
+						[113.233222, 34.640134],
+						[113.231901, 34.639793],
+						[113.230595, 34.638873],
+						[113.229691, 34.637894],
+						[113.228458, 34.635892],
+						[113.226646, 34.635888],
+						[113.223732, 34.637035],
+						[113.222357, 34.637319],
+						[113.220342, 34.637204],
+						[113.216953, 34.636744],
+						[113.213981, 34.635144],
+						[113.212464, 34.635255],
+						[113.209136, 34.636682],
+						[113.207474, 34.637085],
+						[113.205678, 34.637031],
+						[113.204364, 34.636448],
+						[113.203192, 34.634906],
+						[113.201407, 34.630729],
+						[113.199829, 34.628209],
+						[113.198792, 34.62672],
+						[113.199891, 34.626375],
+						[113.202047, 34.624718],
+						[113.202403, 34.622942],
+						[113.202192, 34.620935],
+						[113.201457, 34.615438],
+						[113.20215, 34.612464],
+						[113.203675, 34.610519],
+						[113.204992, 34.609368],
+						[113.206934, 34.609207],
+						[113.209707, 34.610116],
+						[113.212254, 34.610688],
+						[113.214126, 34.609725],
+						[113.21613, 34.609602],
+						[113.217861, 34.610231],
+						[113.220002, 34.611213],
+						[113.222223, 34.6119],
+						[113.222778, 34.610465],
+						[113.220775, 34.608865],
+						[113.220021, 34.607089],
+						[113.221886, 34.607146],
+						[113.225272, 34.608125],
+						[113.229906, 34.60893],
+						[113.232184, 34.609444],
+						[113.232939, 34.611796],
+						[113.233219, 34.613738],
+						[113.233835, 34.615457],
+						[113.236531, 34.616608],
+						[113.238534, 34.616719],
+						[113.240687, 34.617187],
+						[113.242204, 34.619408],
+						[113.243448, 34.62148],
+						[113.245034, 34.622282],
+						[113.248159, 34.6228],
+						[113.251135, 34.622804],
+						[113.253904, 34.623268],
+						[113.257994, 34.62316],
+						[113.262016, 34.623682],
+						[113.265409, 34.62443],
+						[113.269224, 34.624894],
+						[113.273038, 34.625761],
+						[113.276435, 34.626226],
+						[113.279066, 34.626287],
+						[113.281429, 34.626064],
+						[113.284133, 34.625332],
+						[113.286359, 34.624354],
+						[113.288028, 34.623387],
+						[113.290671, 34.621737],
+						[113.292889, 34.621227],
+						[113.299411, 34.621411],
+						[113.303654, 34.621365],
+						[113.3083, 34.621607],
+						[113.313019, 34.621511],
+						[113.316151, 34.620997],
+						[113.318718, 34.621012],
+						[113.322402, 34.622623],
+						[113.324688, 34.624917],
+						[113.328917, 34.628362],
+						[113.332739, 34.630096],
+						[113.334478, 34.629126],
+						[113.33614, 34.627633],
+						[113.337113, 34.626264],
+						[113.339966, 34.624902],
+						[113.343926, 34.625082],
+						[113.347116, 34.624407],
+						[113.349625, 34.623264],
+						[113.35324, 34.62064],
+						[113.35185, 34.618411],
+						[113.351023, 34.6168],
+						[113.354424, 34.614916],
+						[113.357545, 34.613439],
+						[113.36054, 34.612476],
+						[113.363941, 34.611213],
+						[113.366503, 34.610995],
+						[113.36887, 34.611344],
+						[113.370532, 34.612322],
+						[113.371923, 34.613749],
+						[113.373374, 34.615476],
+						[113.373792, 34.617425],
+						[113.374064, 34.620686],
+						[113.375385, 34.623153],
+						[113.376974, 34.62504],
+						[113.378981, 34.626985],
+						[113.382528, 34.629114],
+						[113.385232, 34.628316],
+						[113.387307, 34.627457],
+						[113.391677, 34.623513],
+						[113.393562, 34.622316],
+						[113.394665, 34.619969],
+						[113.395082, 34.61848],
+						[113.395362, 34.616305],
+						[113.394745, 34.6135],
+						[113.394603, 34.610753],
+						[113.394266, 34.609091],
+						[113.395438, 34.607952],
+						[113.398069, 34.607426],
+						[113.403619, 34.606689],
+						[113.407361, 34.606759],
+						[113.416844, 34.609272],
+						[113.421137, 34.60984],
+						[113.427502, 34.610979],
+						[113.434074, 34.611839],
+						[113.438433, 34.612115],
+						[113.44196, 34.612111],
+						[113.444725, 34.612568],
+						[113.446112, 34.61434],
+						[113.447912, 34.617951],
+						[113.449842, 34.620797],
+						[113.451298, 34.619305],
+						[113.452952, 34.618672],
+						[113.454752, 34.618618],
+						[113.456901, 34.618668],
+						[113.4589, 34.619754],
+						[113.460076, 34.620951],
+						[113.461799, 34.623978],
+						[113.462079, 34.628213],
+						[113.462841, 34.630215],
+						[113.463599, 34.632509],
+						[113.461592, 34.635773],
+						[113.45993, 34.637787],
+						[113.45993, 34.640077],
+						[113.460692, 34.641615],
+						[113.463186, 34.64229],
+						[113.464503, 34.643437],
+						[113.466989, 34.645032],
+						[113.468915, 34.644522],
+						[113.470727, 34.644622],
+						[113.471822, 34.646681],
+						[113.472102, 34.648568],
+						[113.472933, 34.651146],
+						[113.473545, 34.653776],
+						[113.475491, 34.655832],
+						[113.48129, 34.657818],
+						[113.484196, 34.659352],
+						[113.487368, 34.660491],
+						[113.491787, 34.662309],
+						[113.496146, 34.662803],
+						[113.499321, 34.662907],
+						[113.501741, 34.663298],
+						[113.503878, 34.664095],
+						[113.506153, 34.665342],
+						[113.507681, 34.667803],
+						[113.507613, 34.669575],
+						[113.506644, 34.671124],
+						[113.505816, 34.672964],
+						[113.506161, 34.674678],
+						[113.506647, 34.676453],
+						[113.50865, 34.68085],
+						[113.508723, 34.682395],
+						[113.507892, 34.685381],
+						[113.50713, 34.68721],
+						[113.506379, 34.689334],
+						[113.506942, 34.692994],
+						[113.507563, 34.696482],
+						[113.507911, 34.700315],
+						[113.508949, 34.704784],
+						[113.50978, 34.707643],
+						[113.511163, 34.710215],
+						[113.512894, 34.712832],
+						[113.517597, 34.717975],
+						[113.518359, 34.721006],
+						[113.517873, 34.722956],
+						[113.516153, 34.723707],
+						[113.514284, 34.724404],
+						[113.511864, 34.724347],
+						[113.508899, 34.725052],
+						[113.503848, 34.725469],
+						[113.499294, 34.725711],
+						[113.49528, 34.724523],
+						[113.494036, 34.723159],
+						[113.491554, 34.722136],
+						[113.488785, 34.723577],
+						[113.487402, 34.725071],
+						[113.485051, 34.725477],
+						[113.4825, 34.725546],
+						[113.479386, 34.725435],
+						[113.476625, 34.724761],
+						[113.473503, 34.724259],
+						[113.472197, 34.725684],
+						[113.471979, 34.727864],
+						[113.472197, 34.729753],
+						[113.473718, 34.731925],
+						[113.476269, 34.732086],
+						[113.478279, 34.731508],
+						[113.480075, 34.731278],
+						[113.482362, 34.732757],
+						[113.484162, 34.735439],
+						[113.485889, 34.736986],
+						[113.490803, 34.738224],
+						[113.488727, 34.739377],
+						[113.48672, 34.740239],
+						[113.485338, 34.741335],
+						[113.48327, 34.74397],
+						[113.481887, 34.746839],
+						[113.481194, 34.749023],
+						[113.481404, 34.75165],
+						[113.480573, 34.754347],
+						[113.476567, 34.756251],
+						[113.474553, 34.756484],
+						[113.470478, 34.756607],
+						[113.467571, 34.75725],
+						[113.464522, 34.75897],
+						[113.464315, 34.761662],
+						[113.465978, 34.763953],
+						[113.467502, 34.765668],
+						[113.468402, 34.768238],
+						[113.467916, 34.769778],
+						[113.467847, 34.771957],
+						[113.468402, 34.774426],
+						[113.470619, 34.774698],
+						[113.474633, 34.774292],
+						[113.476223, 34.773373],
+						[113.477253, 34.770953],
+						[113.479535, 34.768487],
+						[113.482718, 34.768541],
+						[113.485556, 34.768475],
+						[113.488808, 34.768805],
+						[113.493511, 34.769479],
+						[113.495518, 34.771011],
+						[113.494066, 34.772795],
+						[113.493653, 34.775139],
+						[113.494905, 34.777203],
+						[113.492622, 34.777896],
+						[113.489715, 34.778363],
+						[113.487364, 34.778428],
+						[113.485912, 34.779466],
+						[113.485981, 34.7813],
+						[113.487088, 34.782609],
+						[113.487712, 34.784037],
+						[113.487712, 34.786101],
+						[113.488482, 34.793946],
+						[113.487437, 34.796752],
+						[113.484331, 34.797793],
+						[113.482592, 34.798203],
+						[113.478448, 34.798207],
+						[113.477134, 34.797066],
+						[113.476502, 34.794095],
+						[113.474641, 34.791075],
+						[113.472358, 34.791419],
+						[113.470007, 34.792112],
+						[113.463358, 34.793211],
+						[113.460106, 34.793337],
+						[113.457682, 34.794091],
+						[113.455602, 34.795933],
+						[113.455744, 34.798046],
+						[113.456575, 34.799639],
+						[113.45782, 34.801641],
+						[113.458858, 34.802847],
+						[113.460106, 34.804102],
+						[113.460738, 34.805871],
+						[113.4608, 34.807765],
+						[113.460313, 34.809886],
+						[113.459482, 34.811945],
+						[113.457824, 34.813614],
+						[113.454844, 34.815976],
+						[113.453814, 34.81735],
+						[113.45319, 34.819003],
+						[113.453461, 34.82164],
+						[113.455744, 34.824617],
+						[113.457276, 34.830162],
+						[113.457762, 34.83268],
+						[113.458942, 34.834456],
+						[113.462335, 34.835585],
+						[113.464204, 34.835814],
+						[113.466142, 34.835696],
+						[113.468498, 34.835914],
+						[113.472305, 34.837563],
+						[113.474311, 34.837904],
+						[113.476525, 34.837609],
+						[113.478394, 34.83772],
+						[113.479995, 34.83909],
+						[113.483522, 34.840333],
+						[113.486085, 34.839468],
+						[113.489263, 34.83808],
+						[113.493147, 34.837268],
+						[113.495905, 34.837429],
+						[113.498888, 34.837816],
+						[113.50137, 34.838271],
+						[113.504629, 34.838256],
+						[113.507961, 34.840704],
+						[113.508444, 34.842992],
+						[113.508091, 34.844599],
+						[113.507061, 34.847522],
+						[113.507061, 34.849982],
+						[113.509007, 34.854038],
+						[113.509562, 34.856276],
+						[113.5097, 34.858452],
+						[113.509148, 34.860916],
+						[113.50811, 34.862867],
+						[113.506862, 34.86424],
+						[113.505414, 34.865445],
+						[113.504166, 34.866776],
+						[113.502232, 34.867698],
+						[113.499742, 34.869362],
+						[113.497735, 34.872295],
+						[113.497322, 34.875221],
+						[113.498291, 34.878591],
+						[113.498643, 34.88162],
+						[113.497954, 34.885517],
+						[113.498505, 34.886947],
+						[113.49975, 34.888258],
+						[113.501144, 34.88923],
+						[113.504395, 34.891964],
+						[113.508417, 34.89739],
+						[113.509393, 34.899852],
+						[113.509669, 34.901618],
+						[113.508907, 34.903633],
+						[113.508493, 34.905121],
+						[113.506904, 34.907873],
+						[113.505391, 34.909716],
+						[113.504828, 34.911379],
+						[113.503583, 34.914529],
+						[113.50227, 34.916704],
+						[113.501856, 34.918367],
+						[113.501657, 34.922323],
+						[113.502488, 34.926562],
+						[113.503258, 34.933136],
+						[113.503243, 34.933331],
+						[113.505966, 34.954257],
+						[113.510454, 34.961842],
+						[113.516318, 34.963698],
+						[113.522128, 34.966411],
+						[113.522787, 34.967034],
+						[113.515096, 34.965995],
+						[113.495843, 34.959924],
+						[113.477368, 34.957299],
+						[113.474859, 34.957463],
+						[113.465629, 34.958162],
+						[113.45931, 34.959928],
+						[113.452535, 34.960493],
+						[113.449674, 34.960226],
+						[113.429433, 34.964761],
+						[113.428755, 34.969876],
+						[113.429659, 34.977317],
+						[113.427188, 34.983563],
+						[113.419904, 34.987764],
+						[113.407824, 34.989506],
+						[113.394531, 34.986798],
+						[113.388816, 34.985064],
+						[113.381218, 34.982046],
+						[113.37558, 34.98001],
+						[113.371222, 34.977673],
+						[113.362578, 34.970331],
+						[113.358794, 34.965265],
+						[113.352114, 34.958258],
+						[113.349338, 34.95608],
+						[113.343455, 34.950517],
+						[113.333034, 34.944865],
+						[113.328227, 34.943302],
+						[113.320809, 34.942052],
+						[113.315294, 34.942209],
+						[113.304436, 34.945878],
+						[113.30228, 34.946539],
+						[113.28989, 34.952576],
+						[113.279978, 34.953696],
+						[113.27408, 34.954292],
+						[113.266114, 34.954135],
+						[113.260556, 34.953608],
+						[113.252985, 34.951529],
+						[113.243904, 34.946187],
+						[113.239327, 34.9395],
+						[113.23698, 34.92519],
+						[113.231472, 34.91628],
+						[113.228964, 34.911368],
+						[113.227677, 34.908412],
+						[113.222958, 34.90743],
+						[113.220323, 34.906604],
+						[113.214326, 34.905036],
+						[113.207761, 34.903041],
+						[113.197654, 34.900296],
+						[113.189596, 34.897493],
+						[113.185754, 34.896327],
+						[113.184203, 34.89578],
+						[113.179539, 34.893684],
+						[113.176693, 34.89305],
+						[113.170496, 34.891421],
+						[113.168727, 34.891111],
+						[113.16276, 34.889624],
+						[113.1579, 34.887727],
+						[113.156934, 34.887482],
+						[113.153158, 34.887245],
+						[113.140048, 34.884801],
+						[113.139799, 34.884633],
+						[113.142025, 34.877321],
+						[113.147965, 34.85628],
+						[113.147915, 34.856119],
+						[113.144468, 34.855847],
+						[113.14518, 34.853403],
+						[113.147314, 34.847633],
+						[113.147494, 34.846822],
+						[113.147325, 34.845361],
+						[113.146594, 34.843857],
+						[113.146804, 34.842767],
+						[113.147681, 34.841714],
+						[113.149202, 34.840203],
+						[113.15073, 34.837567],
+						[113.152235, 34.835642],
+						[113.15356, 34.833645],
+						[113.154663, 34.83234],
+						[113.156168, 34.831632],
+						[113.156716, 34.83102],
+						[113.157842, 34.828567],
+						[113.158363, 34.826933],
+						[113.158861, 34.82619],
+						[113.161825, 34.823152],
+						[113.163342, 34.821759],
+						[113.164399, 34.821005],
+						[113.166249, 34.820331],
+						[113.166957, 34.819757],
+						[113.167436, 34.818479],
+						[113.167516, 34.817667],
+						[113.167865, 34.817051],
+						[113.166827, 34.81653],
+						[113.164954, 34.815899],
+						[113.163637, 34.815845],
+						[113.162392, 34.816818],
+						[113.160718, 34.818708],
+						[113.159956, 34.818769],
+						[113.159964, 34.817162],
+						[113.159688, 34.815669],
+						[113.158447, 34.81441],
+						[113.156992, 34.81361],
+						[113.15631, 34.812462],
+						[113.155755, 34.810514],
+						[113.1559, 34.808688],
+						[113.15916, 34.806797],
+						[113.161316, 34.806456],
+						[113.164514, 34.80411],
+						[113.163411, 34.802678],
+						[113.161117, 34.802445],
+						[113.156751, 34.804163],
+						[113.155632, 34.804221],
+						[113.154533, 34.803593],
+						[113.153074, 34.802092],
+						[113.152806, 34.800722],
+						[113.152875, 34.799635],
+						[113.154748, 34.799007],
+						[113.156283, 34.798318],
+						[113.157042, 34.797464],
+						[113.154487, 34.795799],
+						[113.152415, 34.793452],
+						[113.152484, 34.792824],
+						[113.153039, 34.79202],
+						[113.156785, 34.792361],
+						[113.159765, 34.793739],
+						[113.161634, 34.793456],
+						[113.161921, 34.790646],
+						[113.160603, 34.789275],
+						[113.157915, 34.785374],
+						[113.154537, 34.781484],
+						[113.152607, 34.779427],
+						[113.151427, 34.777528],
+						[113.151159, 34.775698],
+						[113.152553, 34.774323],
+						[113.154771, 34.773978],
+						[113.157961, 34.773634],
+						[113.160247, 34.77381],
+						[113.16302, 34.773243],
+						[113.164414, 34.772324],
+						[113.165663, 34.77044],
+						[113.167325, 34.768376],
+						[113.168857, 34.76774],
+						[113.169968, 34.765971],
+						[113.170814, 34.762704],
+						[113.17076, 34.757438],
+						[113.169523, 34.754286],
+						[113.167876, 34.750857],
+						[113.166708, 34.748161],
+						[113.166785, 34.745131],
+						[113.167417, 34.743124],
+						[113.169497, 34.742036],
+						[113.171921, 34.741986],
+						[113.173924, 34.743411],
+						[113.175647, 34.745008],
+						[113.176758, 34.746387],
+						[113.177581, 34.747651],
+						[113.178202, 34.749823],
+						[113.177976, 34.752516],
+						[113.177424, 34.753952],
+						[113.177631, 34.755779],
+						[113.179772, 34.757491],
+						[113.182733, 34.759215],
+						[113.186754, 34.759732],
+						[113.190147, 34.75979],
+						[113.194582, 34.758821],
+						[113.198604, 34.758702],
+						[113.201863, 34.757844],
+						[113.208033, 34.75612],
+						[113.2131, 34.754527],
+						[113.215743, 34.752976],
+						[113.220312, 34.751555],
+						[113.224551, 34.750463],
+						[113.22919, 34.750356],
+						[113.231897, 34.750474],
+						[113.234601, 34.751045],
+						[113.23737, 34.752022],
+						[113.240285, 34.753347],
+						[113.24313, 34.754083],
+						[113.246524, 34.753922],
+						[113.24909, 34.754374],
+						[113.251035, 34.753581],
+						[113.253743, 34.75427],
+						[113.25575, 34.755822],
+						[113.25706, 34.758112],
+						[113.258243, 34.761034],
+						[113.258094, 34.762754],
+						[113.258929, 34.764642],
+						[113.258128, 34.766944],
+						[113.257688, 34.770026],
+						[113.257029, 34.772451],
+						[113.256367, 34.776747],
+						[113.255267, 34.781537],
+						[113.253881, 34.785845],
+						[113.25256, 34.787721],
+						[113.252008, 34.790581],
+						[113.253329, 34.796584],
+						[113.253, 34.798456],
+						[113.251284, 34.80091],
+						[113.251009, 34.80246],
+						[113.251085, 34.803922],
+						[113.251954, 34.806609],
+						[113.251683, 34.80881],
+						[113.250143, 34.812447],
+						[113.249756, 34.815585],
+						[113.25058, 34.819868],
+						[113.249538, 34.821249],
+						[113.248071, 34.822604],
+						[113.247481, 34.824353],
+						[113.248155, 34.825819],
+						[113.251058, 34.827537],
+						[113.252184, 34.828835],
+						[113.251935, 34.830503],
+						[113.252728, 34.831735],
+						[113.254314, 34.831957],
+						[113.255631, 34.831471],
+						[113.256757, 34.831463],
+						[113.257125, 34.832168],
+						[113.259867, 34.838363],
+						[113.260966, 34.83974],
+						[113.263272, 34.84147],
+						[113.266374, 34.842813],
+						[113.269825, 34.843589],
+						[113.274229, 34.843907],
+						[113.281315, 34.843597],
+						[113.284876, 34.84367],
+						[113.287094, 34.843321],
+						[113.288791, 34.841313],
+						[113.289105, 34.83899],
+						[113.288978, 34.835673],
+						[113.289472, 34.832921],
+						[113.291675, 34.830614],
+						[113.293494, 34.829757],
+						[113.294976, 34.828911],
+						[113.298005, 34.827885],
+						[113.30079, 34.828291],
+						[113.302839, 34.828111],
+						[113.308377, 34.827874],
+						[113.310319, 34.826783],
+						[113.311908, 34.825589],
+						[113.313635, 34.824005],
+						[113.315661, 34.821406],
+						[113.317653, 34.819627],
+						[113.318836, 34.817055],
+						[113.320445, 34.814823],
+						[113.320406, 34.81309],
+						[113.323405, 34.811983],
+						[113.324639, 34.811436],
+						[113.32434, 34.810464],
+						[113.325673, 34.809905],
+						[113.32545, 34.807674],
+						[113.32619, 34.807528],
+						[113.326071, 34.806962],
+						[113.32519, 34.806456],
+						[113.325198, 34.805729],
+						[113.325883, 34.805561],
+						[113.325791, 34.805028],
+						[113.323547, 34.804986],
+						[113.322946, 34.805323],
+						[113.32257, 34.805147],
+						[113.321682, 34.805652],
+						[113.320207, 34.80566],
+						[113.319951, 34.804133],
+						[113.320181, 34.802705],
+						[113.319958, 34.802517],
+						[113.318775, 34.802425],
+						[113.318243, 34.802062],
+						[113.318147, 34.798781],
+						[113.318534, 34.795573],
+						[113.3173, 34.792047],
+						[113.316171, 34.789153],
+						[113.314336, 34.785837],
+						[113.312195, 34.78184],
+						[113.311261, 34.778202],
+						[113.309108, 34.775062],
+						[113.306021, 34.771807],
+						[113.305412, 34.769766],
+						[113.304754, 34.766848],
+						[113.304424, 34.764041],
+						[113.302712, 34.762991],
+						[113.300839, 34.762271],
+						[113.298358, 34.761992],
+						[113.293838, 34.762482],
+						[113.291812, 34.762608],
+						[113.288281, 34.760889],
+						[113.287841, 34.758637],
+						[113.290388, 34.755894],
+						[113.29408, 34.754232],
+						[113.295975, 34.75265],
+						[113.298136, 34.751156],
+						[113.299285, 34.749835],
+						[113.299461, 34.748073],
+						[113.299369, 34.746441],
+						[113.298002, 34.743533],
+						[113.29717, 34.741043],
+						[113.297488, 34.739507],
+						[113.298365, 34.738902],
+						[113.300376, 34.738094],
+						[113.305229, 34.736408],
+						[113.306852, 34.735577],
+						[113.308254, 34.735013],
+						[113.308794, 34.734159],
+						[113.309315, 34.732761],
+						[113.309139, 34.730734],
+						[113.307687, 34.727385],
+						[113.305125, 34.725837],
+						[113.302789, 34.724734],
+						[113.300939, 34.722615],
+						[113.299878, 34.720458],
+						[113.299085, 34.718296],
+						[113.296749, 34.71653],
+						[113.294501, 34.715426],
+						[113.292823, 34.714897],
+						[113.29084, 34.714143],
+						[113.289032, 34.714143],
+						[113.287534, 34.715154],
+						[113.284892, 34.718013],
+						[113.282157, 34.719952],
+						[113.278327, 34.722105],
+						[113.27652, 34.722676],
+						[113.273877, 34.723205],
+						[113.272065, 34.723098]
+					]
+				]
+			]
+		}
+	}]
+}

msdYongHu/unpackage/cache/wgt/__UNI__F607D49/hybrid/html/maps/js/lib/common.js

@@ -0,0 +1,92 @@
+/**
+ * MapID
+ * 
+ * 
+ * */
+var MAPID = 'c0248134c43b27bf'
+
+/**
+ * 
+ * 获取url地址参数
+ * 
+ * */
+
+function getQueryVariable(variable) {
+	var query = decodeURI(window.location.search.substring(1));
+	var vars = query.split("&");
+	for (var i = 0; i < vars.length; i++) {
+		var pair = vars[i].split("=");
+		if (pair[0] == variable) {
+			return pair[1];
+		}
+	}
+	return (false);
+}
+
+
+
+/**
+ * 随机生成颜色rgb值
+ * 
+ * */
+
+function getRandomColor() {
+	const letters = '0123456789ABCDEF'; // 16进制颜色表示中可能出现的字符
+	let color = '#';
+	for (let i = 0; i < 6; i++) { // 随机生成6位十六进制数
+		color += letters[Math.floor(Math.random() * 16)]; // 根据随机数选取相应的字符
+	}
+	return color;
+}
+
+
+/**
+ * 随机生成中文文字
+ * 辅助方法 实际中可废弃
+ * */
+function randomChinese(num) {
+
+	let str = "";
+	const words = ["Lorem", "ipsum", "dolor", "sit", "amet", "consectetur", "adipiscing", "elit", "sed", "do",
+		"eiusmod", "tempor",
+		"incididunt", "ut", "labore", "et", "dolore", "magna", "aliqua", "Ut", "enim", "ad", "minim", "veniam",
+		"quis",
+		"nostrud", "exercitation", "ullamco", "laboris", "nisi", "ut", "aliquip", "ex", "ea", "commodo",
+		"consequat",
+		"Duis", "aute", "irure", "dolor", "in", "reprehenderit", "in", "voluptate", "velit", "esse", "cillum",
+		"dolore",
+		"eu", "fugiat", "nulla", "pariatur", "Excepteur", "sint", "occaecat", "cupidatat", "non", "proident",
+		"sunt",
+		"in", "culpa", "qui", "officia", "deserunt", "mollit", "anim", "id", "est", "laborum"
+	];
+	for (let i = 0; i < num; i++) {
+		const randomWord = words[Math.floor(Math.random() * words.length)];
+		str += randomWord + " ";
+	}
+	return str.trim();
+}
+
+
+/**
+ * 加载动画
+ * 
+ */
+function LoadAnimation(isFalse) {
+	if (isFalse) {
+		document.getElementById("loader").style.display = "inline";
+	} else {
+		document.getElementById("loader").style.display = "none";
+	}
+
+}
+
+
+
+// export default {
+// 	LoadAnimation,
+// 	randomChinese,
+// 	getRandomColor,
+// 	getQueryVariable,
+// 	getMapID
+
+// }

msdYongHu/unpackage/cache/wgt/__UNI__F607D49/hybrid/html/maps/js/lib/rem.js

@@ -0,0 +1,26 @@
+!(function(window) {
+  /* 设计图文档宽度 */
+  var docWidth = 750;
+  var doc = window.document,
+    docEl = doc.documentElement,
+    resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize';
+  var recalc = (function refreshRem() {
+    var clientWidth = docEl.getBoundingClientRect().width;
+    /* 8.55：小于320px不再缩小，11.2：大于420px不再放大 */
+    docEl.style.fontSize = Math.max(Math.min(20 * (clientWidth / docWidth), 11.2), 8.55) * 5 + 'px';
+    return refreshRem;
+  })();
+  /* 添加倍屏标识，安卓为1 */
+  docEl.setAttribute('data-dpr', window.navigator.appVersion.match(/iphone/gi) ? window.devicePixelRatio : 1);
+  if (/iP(hone|od|ad)/.test(window.navigator.userAgent)) {
+    /* 添加IOS标识 */
+    doc.documentElement.classList.add('ios');
+    /* IOS8以上给html添加hairline样式，以便特殊处理 */
+    if (parseInt(window.navigator.appVersion.match(/OS (\d+)_(\d+)_?(\d+)?/)[1], 10) >= 8)
+      doc.documentElement.classList.add('hairline');
+  }
+  if (!doc.addEventListener)
+    return;
+  window.addEventListener(resizeEvt, recalc, false);
+  doc.addEventListener('DOMContentLoaded', recalc, false);
+})(window);