update

mobile-code/src/components/app-area-sel.vue

@@ -0,0 +1,237 @@
+<template>
+	<div class="app-area-sel">
+		<bottom-popup class="popup-wrap" :show="show" @close="hidePopup">
+			<div class="map-wrap">
+				<div class="map-top-tit-wrap">
+					<div class="map-top-tit">选择收货地址</div>
+					<app-close icon="iconguanbi" @close="hidePopup" />
+				</div>
+				<!-- 搜索 -->
+				<div class="map-search">
+					<app-search-module placeholder="请输入你的收货地址" />
+				</div>
+				<!-- 地图 -->
+				<div class="map-box">
+					<map id="myMap" style="width: 100%; height: 140px;" :latitude="latitude" :longitude="longitude" @regionchange="mapChange">
+						<cover-image class="current-site-icon" src="../../static/images/common/localposition.png"></cover-image>
+						<cover-view class="reload" @click="reload">
+							<cover-view class="center1">
+								<cover-view class="center2"></cover-view>
+							</cover-view>
+						</cover-view>
+					</map>
+				</div>
+				<!-- 列表 -->
+				<scroll-view class="near-list" scroll-y>
+					<view v-for="(item,index) in nearListData" :key="index" @click="switchAddress(item,index)" class="near-item">
+						<div class="current-site" :class="{'active' : currentSelectAddress === index}"></div>
+						<view>
+							<view :class="['title',currentSelectAddress === index? 'title1':'']">{{item.title}}</view>
+							<view class="add">{{item.address}}</view>
+						</view>
+					</view>
+				</scroll-view>
+			</div>
+		</bottom-popup>
+	</div>
+</template>
+
+<script>
+import bottomPopup from '@/components/plugin/bottom-popup'
+import appClose from '@/components/module/app-close'
+import appSearchModule from '@/components/module/app-search'
+export default {
+	name: 'app-area-sel',
+	components: {
+		bottomPopup,
+		appClose,
+		appSearchModule
+	},
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			// 地图
+			latitude: 24.44579,
+			longitude: 118.08243,
+			// 列表
+			currentSelectAddress: 0,
+			nearListData: [
+				{
+					title: '中国共产党厦门市思明区纪律检查委员会',
+					address: '福建省厦门市思明区民族路33号'
+				},
+				{
+					title: '厦门市思明区人民政府',
+					address: '福建省厦门市思明区民族路33号'
+				},
+				{
+					title: '海滨商厦',
+					address: '福建省厦门市思明区民族路42～44'
+				},
+				{
+					title: '卢卡国际青年旅舍',
+					address: '福建省厦门市思明区民族路35号(思明区政府对面)'
+				},
+				{
+					title: '中国共产党厦门市思明区纪律检查委员会',
+					address: '福建省厦门市思明区民族路33号'
+				},
+				{
+					title: '厦门市思明区人民政府',
+					address: '福建省厦门市思明区民族路33号'
+				},
+				{
+					title: '海滨商厦',
+					address: '福建省厦门市思明区民族路42～44'
+				}
+			]
+		}
+	},
+	onLoad(val) {
+		this.mapCtx = uni.createMapContext('myMap')
+		this.query = val
+		this.reload()
+	},
+	methods: {
+		hidePopup() {
+			this.$emit('hide')
+		},
+		// 地图操作
+		reload() {
+			uni.getLocation({
+				type: 'wgs84',
+				success: res => {
+					this.latitude = res.latitude
+					this.longitude = res.longitude
+					// this.nearList()
+				},
+				// eslint-disable-next-line handle-callback-err
+				fail: err => {
+					this.$msg('定位失败')
+					// setTimeout(function() {
+					// 	uni.navigateBack({
+					// 		delta: 1
+					// 	})
+					// }, 1500)
+				}
+			})
+		},
+		mapChange(e) {
+			if (e.type == 'end' && (e.causedBy == 'scale' || e.causedBy == 'drag')) {
+				this.mapCtx.getCenterLocation({
+					success: res => {
+						this.longitude = res.longitude
+						this.latitude = res.latitude
+						// this.nearList()
+					}
+				})
+			}
+		},
+		// 获取列表
+		nearList() {
+			geocoder({
+				latitude: this.latitude,
+				longitude: this.longitude
+			}).then(res => {
+				console.log(res)
+				let data = res.result
+				this.currentSelectAddress = 0
+				this.nearListData = data.pois
+				// this.currentRegion = [data.address_component.province, data.address_component.city, data.address_component.district]
+			})
+		},
+		switchAddress(item, index) {
+			// this.currentSelectAddress = index
+			// this.latitude = item.location.lat
+			// this.longitude = item.location.lng
+			// if (!this.$util.isEmpty(item.province) && !this.$util.isEmpty(item.city)) {
+			// 	this.currentRegion = [item.province, item.city, item.district]
+			// }
+			this.$emit('change', item)
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	// 弹窗
+	/deep/.popup-wrap {
+		.tui-popup-class {
+			border-top-left-radius: 20px;
+			border-top-right-radius: 20px;
+		}
+	}
+	.map-wrap {
+		.map-top-tit-wrap {
+			padding: 30px 0;
+			text-align: center;
+			font-size: 34px;
+		}
+		.map-search {
+			padding: 0 30px;
+			margin-bottom: 20px;
+		}
+		.map-box {
+			.current-site-icon {
+				width: 63px;
+				height: 90px;
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+			}
+		}
+
+		// 列表
+		.near-list {
+			height: 620rpx;
+			// padding-bottom: 110rpx;
+			box-sizing: border-box;
+			.near-item {
+				line-height: 40rpx;
+				padding: 18rpx 50rpx 18rpx 0;
+				margin-left: 90px;
+				text-align: left;
+				border-bottom: 1px solid #eee;
+				position: relative;
+			}
+			.current-site {
+				width: 16px;
+				height: 16px;
+				background-color: #dedede;
+				border-radius: 50%;
+				position: absolute;
+				top: 60rpx;
+				left: -60rpx;
+				&.active {
+					background-color: $mainColor;
+				}
+			}
+			.near-item .title {
+				color: #282828;
+				font-size: 28rpx;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+			.near-item .add {
+				color: $fontColor3;
+				font-size: 22rpx;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+			.near-item .title1 {
+				color: $mainColor;
+			}
+			.near-item .add1 {
+				color: $mainColor;
+			}
+		}
+	}
+</style>

mobile-code/src/components/app-delivery.vue

@@ -99,6 +99,8 @@
 			<checkbox class="ljd-checkbox" @change="giftChange"></checkbox>
 			<span class="none-name-text">匿名派送</span>
 		</div>
+        <!-- 选择地区 -->
+        <app-area-sel :show="showRegion" @hide="hideAreaSel" @change="changeAreaFn" />
 	</div>
 </template>
 
@@ -108,6 +110,7 @@ import appDatePicker from '@/components/app-date-picker'
 import appTextarea from '@/components/app-textarea'
 import appListModule from '@/components/module/app-order-list'
 import appCouponSel from '@/components/app-coupon-sel'
+import appAreaSel from '@/components/app-area-sel'
 export default {
 	name: 'app-delivery-module',
 	components: {
@@ -115,22 +118,30 @@ export default {
 		appDatePicker,
 		appTextarea,
 		appListModule,
-		appCouponSel
+		appCouponSel,
+		appAreaSel
 	},
 	data() {
 		return {
 			time: '',
 			timeTodaySel: 0,
-			region: []
+			region: [],
+			gift: '',
+			showRegion: false
 		}
 	},
 	methods: {
 		selTimeFn(e) {
 			this.time = e.detail.value
-			console.log(e)
 		},
-		selRegionFn(e) {
-			// this.region = e.detail.value
+		selRegionFn() {
+			this.showRegion = true
+		},
+		changeAreaFn(item) {
+			console.log(item)
+		},
+		hideAreaSel() {
+			this.showRegion = false
 		},
 		timeTodaySelFn(index) {
 			this.timeTodaySel = index
@@ -204,7 +215,11 @@ export default {
 			.shop-prompt {
 				@include disFlex(center, space-between);
 				color: $fontColor2;
-				margin: 20px 0;
+                margin: 20px 0;
+                .iconfont {
+                    color: $fontColor3;
+                    margin-left: 8px;
+                }
 			}
 		}
 		// 可选优惠

mobile-code/src/components/module/app-activily-coupon.vue

@@ -1,5 +1,5 @@
 <template>
-	<modal :show="modalShow" @cancel="modalCancel" :custom="true" padding="0 0" bgcolor="none">
+	<modal :show="show" @cancel="modalCancel" :custom="true" padding="0 0" bgcolor="none">
 		<div class="app-activily-coupon" @click="receive">
 			<div class="sctivliy-bg">
 				<img src="../../static/images/coupon/new-bg.png" alt mode="widthFix" />
@@ -37,17 +37,21 @@ export default {
 	components: {
 		modal
 	},
-	data() {
-		return {
-			modalShow: true
+	props: {
+		show: {
+			type: Boolean,
+			default: false
 		}
 	},
+	data() {
+		return {}
+	},
 	methods: {
 		receive() {
 			console.log('领取！')
 		},
 		modalCancel() {
-			this.modalShow = false
+			this.show = false
 		}
 	}
 }

mobile-code/src/components/module/app-close.vue

@@ -1,14 +1,19 @@
 <template>
     <!-- 公共按钮 -->
 	<div class="app-close" @click="close">
-		<i class="iconfont iconclose"></i>
+		<i class="iconfont" :class="[icon]"></i>
 	</div>
 </template>
 
 <script>
 export default {
 	name: 'app-close',
-	props: {},
+	props: {
+		icon: {
+			type: String,
+			default: 'iconclose'
+		}
+	},
 	methods: {
 		close() {
 			this.$emit('close')

mobile-code/src/components/module/app-search.vue

@@ -0,0 +1,48 @@
+<template>
+	<div class="app-search-module">
+        <div class="icon-wrap">
+            <i class="iconfont iconsearch"></i>
+        </div>
+        <div class="input-wrap">
+            <input type="text" :placeholder="placeholder" placeholder-class="placeholder">
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+	name: 'app-search-module',
+	props: {
+		placeholder: {
+			type: String,
+			default: '请输入'
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.app-search-module {
+    @include disFlex(center, flex-start);
+    height: 66px;
+    width: 100%;
+    background-color: #F0F2F6;
+    border-radius: 10px;
+    .icon-wrap {
+        margin: 0 14px 0 20px;
+        width: 40px;
+        .iconfont {
+            color: #ccc;
+        }
+    }
+    .input-wrap {
+        width: calc(100% - 90px);
+        input {
+            font-size: 26px;
+        }
+        .placeholder {
+            color: #ccc;
+        }
+    }
+}
+</style>

mobile-code/src/components/plugin/list-cell.vue

@@ -118,7 +118,7 @@ export default {
 		transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
 		position: absolute;
 		top: 50%;
-		margin-top: -7px;
+		margin-top: -12px;
 		right: 30rpx;
 	}
 </style>

mobile-code/src/components/plugin/tabs.vue

@@ -172,6 +172,7 @@ export default {
 		align-items: center;
 		justify-content: space-between;
 		z-index: 99;
+    	box-shadow: 4px 4px 10px #eee;
 		.tui-tabs-item {
 			&.border-left {
 				border-left: 2px solid #ddd;

mobile-code/src/pages.json

@@ -164,26 +164,26 @@
 		"backgroundColor": "#ffffff",
 		"list": [{
 				"pagePath": "pages/home/index",
-				"iconPath": "static/images/extension.png",
-				"selectedIconPath": "static/images/extension.png",
+				"iconPath": "static/images/common/home-no.png",
+				"selectedIconPath": "static/images/common/home-is.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/category/index",
-				"iconPath": "static/images/extension.png",
-				"selectedIconPath": "static/images/extension.png",
+				"iconPath": "static/images/common/category-no.png",
+				"selectedIconPath": "static/images/common/category-is.png",
 				"text": "分类"
 			},
 			{
 				"pagePath": "pages/shop/index",
-				"iconPath": "static/images/extension.png",
-				"selectedIconPath": "static/images/extension.png",
+				"iconPath": "static/images/common/shop-no.png",
+				"selectedIconPath": "static/images/common/shop-is.png",
 				"text": "门店"
 			},
 			{
 				"pagePath": "pages/user/index",
-				"iconPath": "static/images/extension.png",
-				"selectedIconPath": "static/images/extension.png",
+				"iconPath": "static/images/common/user-no.png",
+				"selectedIconPath": "static/images/common/user-is.png",
 				"text": "我的"
 			}
 		]

mobile-code/src/pages/goods/components/buy-foot.vue

@@ -47,8 +47,6 @@ export default {
         @include disFlex(center, center);
         .button-com {
             width: calc(90% - 30px);
-            height: 50px;
-            line-height: 50px;
             font-size: 32px;
             font-weight: 400;
         }

mobile-code/src/pages/goods/detail.vue

@@ -12,9 +12,10 @@
 				<div class="tui-pro-title app-size-32">谈判官明星同款耳坠韩国气质简约显脸瘦的耳环女百搭个性长款耳钉 个性水滴耳环【A2】</div>
 				<button open-type="share" class="tui-share-btn tui-share-position">
 					<app-tag type="gray" tui-tag-class="tui-tag-share tui-size" shape="circleLeft" size="small">
-						<div class="tui-icon tui-icon-partake" style="color:#999; font-size:15px"></div>
-						<!-- <tui-icon name="partake" color="#999" size="15"></tui-icon> -->
-						<text class="tui-share-text tui-gray">分享</text>
+						<div class="flex-center">
+							<i class="iconfont iconfenxiang"></i>
+							<text class="tui-share-text tui-gray">分享</text>
+						</div>
 					</app-tag>
 				</button>
 			</div>
@@ -29,7 +30,7 @@
 		<div class="module-wrap shop-detail">
 			<div class="module-tit app-size-30">商品详情</div>
 			<div class="module-det">
-				<img src="../../static/images/swiper.png" alt="" mode="widthFix" />
+				<img src="../../static/images/swiper.png" alt mode="widthFix" />
 			</div>
 		</div>
 		<!-- 商品详情 -->
@@ -63,7 +64,7 @@ export default {
 	data() {
 		return {
 			buyNum: 1,
-			popupShow: true
+			popupShow: false
 		}
 	},
 	onLoad(option) {},
@@ -82,52 +83,57 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.app-content {
-	padding-bottom: 120px;
-	// 公共模块
-	.module-wrap {
-		margin-top: 20px;
-		background-color: #fff;
-		.module-tit {
-			padding: 14px 30px;
-			border-bottom: 1px solid $borderColor;
-		}
-		.module-det {
-			color: $fontColor2;
-		}
-	}
-	// 公共模块
-	.shop-intro {
-		background: #fff;
-		padding: 30px 0 30px 30px;
-		.tui-pro-titbox {
-			margin: 30px 0 20px;
-			@include disFlex(center, space-between);
-			.tui-pro-title {
-				width: 80%;
+	.app-content {
+		padding-bottom: 120px;
+		// 公共模块
+		.module-wrap {
+			margin-top: 20px;
+			background-color: #fff;
+			.module-tit {
+				padding: 14px 30px;
+				border-bottom: 1px solid $borderColor;
 			}
-			.tui-share-btn {
-				display: block;
-				background: none;
-				margin: 0;
-				padding: 0;
-				border-radius: 0;
-				.tui-share-text {
-					padding-left: 4px;
+			.module-det {
+				color: $fontColor2;
+			}
+		}
+		// 公共模块
+		.shop-intro {
+			background: #fff;
+			padding: 30px 0 30px 30px;
+			.tui-pro-titbox {
+				margin: 30px 0 20px;
+				@include disFlex(center, space-between);
+				.tui-pro-title {
+					width: 80%;
+				}
+				.tui-share-btn {
+					display: block;
+					background: none;
+					margin: 0;
+					padding: 0;
+					border-radius: 0;
+					.tui-share-text {
+						padding-left: 4px;
+						color: $fontColor3;
+					}
+				}
+				.iconfenxiang {
+					font-size: 26px;
 					color: $fontColor3;
+					margin-right: 6px;
 				}
 			}
+			.shop-express {
+				padding-right: 30px;
+				@include disFlex(center, space-between);
+			}
 		}
-		.shop-express {
-			padding-right: 30px;
-			@include disFlex(center, space-between);
-		}
-	}
-	.shop-desc {
-		.module-det {
-			padding: 24px;
-			line-height: 48px;
+		.shop-desc {
+			.module-det {
+				padding: 24px;
+				line-height: 48px;
+			}
 		}
 	}
-}
 </style>

mobile-code/src/pages/home/index.vue

@@ -2,8 +2,10 @@
 	<div class="app-main app-content">
 		<button @click="toPay">去支付页</button>
 		<button @click="$util.pageTo('/pages/callback/index')">支付回调</button>
+		<button @click="$util.pageTo('/pages/user/register')">注册</button>
+		<button @click="$util.pageTo('/pages/user/password')">修改密码</button>
 		<!-- <app-footer /> -->
-		<app-activily-coupon />
+		<app-activily-coupon :show="false" />
 	</div>
 </template>
 

mobile-code/src/pages/interest/invite.vue

@@ -42,7 +42,7 @@
 					<div class="app-size-30">邀请记录</div>
 					<div class="flex-center-end app-color-3">
 						<span>规则说明</span>
-						<i class="iconfont iconxiaoxi"></i>
+						<i class="iconfont iconchangjianwentixiangguanwenti2"></i>
 					</div>
 				</div>
 				<div class="invite-list-wrap">

mobile-code/src/pages/order/buy.vue

@@ -51,6 +51,18 @@
 			</div>
 			<button class="button-com red">确认</button>
 		</div>
+		<!-- 弹窗 -->
+		<alert-module :show="showAlert" @click="hideAlert" @cancel="hideAlert">
+			<div class="alt-content">
+				<div>5公里内免运费</div>
+				<div>
+					<span>超过</span>
+					<span class="app-price">5公里</span>
+					<span>每增加1公里</span>
+					<span class="app-price">+2元</span>
+				</div>
+			</div>
+		</alert-module>
 	</div>
 </template>
 
@@ -61,6 +73,7 @@ import appDeliveryModule from '@/components/app-delivery'
 import appTrademark from '@/components/module/app-trademark'
 import appListModule from '@/components/module/app-order-list'
 import appCouponSel from '@/components/app-coupon-sel'
+import alertModule from '@/components/plugin/alert'
 export default {
 	name: 'order-buy',
 	components: {
@@ -69,7 +82,8 @@ export default {
 		tuiListCell,
 		appListModule,
 		appCouponSel,
-		appTrademark
+		appTrademark,
+		alertModule
 	},
 	data() {
 		return {
@@ -81,12 +95,16 @@ export default {
 				{
 					name: '我要自提'
 				}
-			]
+			],
+			showAlert: false
 		}
 	},
 	methods: {
 		tabChange(e) {
 			this.tabIndex = e.index
+		},
+		hideAlert() {
+			this.showAlert = false
 		}
 	}
 }
@@ -94,8 +112,9 @@ export default {
 
 <style lang='scss' scoped>
 	.app-content {
-        padding-top: 100px;
-        padding-bottom: 120px;
+		padding-top: 100px;
+		padding-bottom: 120px;
+		min-height: 0;
 		.module-com {
 			margin-bottom: 20px;
 			background-color: #fff;
@@ -140,7 +159,7 @@ export default {
 				padding-top: 20px;
 				padding-bottom: 20px;
 			}
-        }
+		}
 	}
 	.page-btn {
 		width: calc(100% - 60px);
@@ -154,4 +173,13 @@ export default {
 			width: 270px;
 		}
 	}
+	// 弹窗
+	/deep/.tui-alert-content {
+		padding: 40px 40px;
+	}
+	.alt-content {
+		& > div {
+			margin: 10px 0;
+		}
+	}
 </style>

mobile-code/src/pages/pay/components/keyboard.vue

@@ -7,7 +7,7 @@
 				</ul>
 				<ul class="ui-keyboard-btn">
 					<li class="btn-del" @click="del">
-                        <i class="iconfont iconclose"></i>
+                        <i class="iconfont iconshanchu"></i>
                     </li>
 					<li class="btn-ok" @click="comfirm">完成</li>
 				</ul>

mobile-code/src/pages/pay/index.vue

@@ -25,7 +25,9 @@
 			</div>
 		</block>
 		<!-- 我要配送 -->
-		<block v-else></block>
+		<block v-else>
+			<app-delivery-module />
+		</block>
 		<!-- <button @click="_pay">提交</button> -->
 	</div>
 </template>
@@ -33,6 +35,7 @@
 <script>
 import appTabs from '@/components/plugin/tabs'
 import payInputModule from './components/pay-input'
+import appDeliveryModule from '@/components/app-delivery'
 import { getMiniAppUrl } from '@/utils/common'
 import { getCheckLogin } from '@/utils/auth'
 import wexinPay from '@/utils/pay/wxPay'
@@ -42,7 +45,8 @@ export default {
 	name: 'pay',
 	components: {
 		appTabs,
-		payInputModule
+		payInputModule,
+		appDeliveryModule
 	},
 	data() {
 		return {
@@ -126,8 +130,13 @@ export default {
 </script>
 
 <style lang="scss">
+	.app-content {
+		min-height: 0;
+        padding-top: 100px;
+		// padding-bottom: 120px;
+	}
 	.logo-wrap {
-		padding-top: 170px;
+		padding-top: 70px;
 		padding-bottom: 60px;
 		text-align: center;
 		.logo-img {

mobile-code/src/pages/user/index.vue

@@ -49,27 +49,26 @@
 				<tui-list-cell class="tui-list" :arrow="true" @click="$util.pageTo('/pages/order/list')">
 					<div class="list-wrap">
 						<div class="list-label">我的订单</div>
+						<div class="list-text">2</div>
 					</div>
 				</tui-list-cell>
-				<tui-list-cell class="tui-list" @click="$util.pageTo('/pages/interest/invite')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="$util.pageTo('/pages/interest/invite')">
 					<div class="list-wrap">
 						<div class="list-label">我的邀请</div>
-					</div>
-					<div class="list-icon">
-						<i class="iconfont iconshoujihao"></i>
+						<div class="list-text">领金币奖励</div>
 					</div>
 				</tui-list-cell>
-				<tui-list-cell class="tui-list" @click="$util.pageTo('/pages/coupon/list')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="$util.pageTo('/pages/coupon/list')">
 					<div class="list-wrap">
 						<div class="list-label">我的优惠券</div>
 					</div>
 				</tui-list-cell>
-				<tui-list-cell class="tui-list" @click="detail">
+				<tui-list-cell class="tui-list" :arrow="true" @click="$util.pageTo('/pages/user/password')">
 					<div class="list-wrap">
 						<div class="list-label">支付密码设置</div>
 					</div>
 				</tui-list-cell>
-				<tui-list-cell class="tui-list" @click="$util.pageTo('/pages/interest/level')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="$util.pageTo('/pages/interest/level')">
 					<div class="list-wrap">
 						<div class="list-label">会员权益</div>
 					</div>
@@ -98,7 +97,7 @@
 						<img src="../../static/images/user/attr-default.png" alt />
 					</div>
 					<div class="creat-account-btn">
-						<button class="button-com red">点击创建头像</button>
+						<button class="button-com red big">点击创建头像</button>
 					</div>
 				</template>
 				<!-- 注册完成 -->
@@ -110,7 +109,7 @@
 						<div class="phone-num font-bold">13285979347</div>
 					</div>
 					<div class="creat-account-btn">
-						<button class="button-com red">点击创建头像</button>
+						<button class="button-com red big">点击创建头像</button>
 					</div>
 				</template>
 				<!-- 关注公众号 -->
@@ -120,7 +119,7 @@
 						<div class="flex-center-between">
 							<div class="wx-public-left">
 								<div class="wx-public-img">
-									<img src="../../static/images/user/attr-default.png" alt="">
+									<img src="../../static/images/user/attr-default.png" alt />
 								</div>
 								<div class="wx-public-det">
 									<div class="wx-public-tit">国兰华尚</div>
@@ -262,13 +261,21 @@ export default {
 			padding-left: 50px;
 			padding-right: 50px;
 		}
+		.list-wrap {
+			@include disFlex(center, space-between);
+			width: calc(100% - 30px);
+			padding-right: 30px;
+			.list-text {
+				color: $fontColor3;
+			}
+		}
 	}
 	// 弹窗
 	/deep/.popup-wrap {
 		.tui-popup-class {
 			border-top-left-radius: 20px;
 			border-top-right-radius: 20px;
-        	// 适配iphoneX
+			// 适配iphoneX
 			padding-bottom: env(safe-area-inset-bottom);
 		}
 		.popup-content {
@@ -288,9 +295,7 @@ export default {
 				padding-bottom: 80px;
 				margin: 0 auto;
 				.button-com {
-					width: calc(100% - 60px);
-					height: 50px;
-					line-height: 50px;
+					width: 100%;
 					text-align: center;
 					font-size: 32px;
 				}
@@ -331,7 +336,7 @@ export default {
 							height: 78px;
 						}
 						.wx-public-det {
-							color: #7C7E7D;
+							color: #7c7e7d;
 							margin-left: 20px;
 							.wx-public-tit {
 								color: #333;

mobile-code/src/static/css/common.scss

@@ -150,7 +150,7 @@ body {
     text-align: center;
     bottom: 0;
     background: white;
-    box-shadow: -4px -4px 6px #eee; /*no*/
+    box-shadow: -4px -4px 6px #eee;
     z-index: 100;
     // font-size: 32px;
     // line-height: 90px;

mobile-code/src/static/iconfont/iconfont.css

@@ -1,12 +1,12 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://at.alicdn.com/t/font_1525256_qav13ygth5g.eot');
-  src: url('https://at.alicdn.com/t/font_1525256_qav13ygth5g.eot?#iefix') format('embedded-opentype'),
-  url('https://at.alicdn.com/t/font_1525256_qav13ygth5g.woff2') format('woff2'),
-  url('https://at.alicdn.com/t/font_1525256_qav13ygth5g.woff') format('woff'),
-  url('https://at.alicdn.com/t/font_1525256_qav13ygth5g.ttf') format('truetype'),
-  url('https://at.alicdn.com/t/font_1525256_qav13ygth5g.svg#iconfont') format('svg');
-}  
+  src: url('https://at.alicdn.com/t/font_1525256_shwvpql9q4.eot');
+  src: url('https://at.alicdn.com/t/font_1525256_shwvpql9q4.eot?#iefix') format('embedded-opentype'),
+  url('https://at.alicdn.com/t/font_1525256_shwvpql9q4.woff2') format('woff2'),
+  url('https://at.alicdn.com/t/font_1525256_shwvpql9q4.woff') format('woff'),
+  url('https://at.alicdn.com/t/font_1525256_shwvpql9q4.ttf') format('truetype'),
+  url('https://at.alicdn.com/t/font_1525256_shwvpql9q4.svg#iconfont') format('svg');
+}
 
 .iconfont {
   font-family: "iconfont" !important;
@@ -16,6 +16,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconchangjianwentixiangguanwenti2:before {
+  content: "\e679";
+}
+
 .icondaizhifu:before {
   content: "\e733";
 }
@@ -92,3 +96,27 @@
   content: "\e745";
 }
 
+.icontupian:before {
+  content: "\e746";
+}
+
+.iconxiaochengxu:before {
+  content: "\e747";
+}
+
+.iconzhifubao:before {
+  content: "\e748";
+}
+
+.iconkefu:before {
+  content: "\e749";
+}
+
+.iconshanchu:before {
+  content: "\e74a";
+}
+
+.iconguanbi:before {
+  content: "\e74b";
+}
+