瀏覽代碼

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/zxyj-mini-html into develop

lilei 4 年之前
父節點
當前提交
783dbb07fb
共有 4 個文件被更改,包括 16 次插入4 次删除
  1. 1 1
      pages/index/index.vue
  2. 3 0
      pages/toOrder/editAddress.vue
  3. 11 2
      pages/toOrder/index.vue
  4. 1 1
      pages/userCenter/zhinan.vue

+ 1 - 1
pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<u-swiper height="250" @click="clickBanner" :list="imageTopList" ></u-swiper>
+		<u-swiper height="250" @click="clickBanner" :list="imageTopList"></u-swiper>
 		<!-- 导航按钮 -->
 		<view class="nav">
 			<u-grid :col="4" :border="false" @click="toPage">

+ 3 - 0
pages/toOrder/editAddress.vue

@@ -69,6 +69,9 @@
 		onLoad(option) {
 			this.form = this.$store.state.vuex_OrderAddress
 			if (this.form.receiveAreasName) {
+				this.receiveAreas = this.form.receiveAreas
+				this.areaName = this.form.receiveAreasName
+				this.form.receiveAreasName = this.form.receiveAreasName.replace(/\,/g,'-')
 				uni.setNavigationBarTitle({
 					title: '修改地址'
 				})

+ 11 - 2
pages/toOrder/index.vue

@@ -9,7 +9,7 @@
 				<u-image height="40rpx" width="40rpx" src="/static/position.png"></u-image>
 			</view>
 			<view class="position">
-				 <view class="address">{{userInfo.receiveAddress}}</view>
+				 <view class="address">{{receiveAddress}}</view>
 				 <view>{{userInfo.receiverName +'&nbsp;&nbsp;&nbsp;' + userInfo.receiverPhone}}</view>
 			</view>
 			<view @click="editAddress">
@@ -134,12 +134,20 @@
 			uni.$once('setPswSuccess', this.setPsw)
 		},
 		computed: {
+			// 总计
 			totalPrice() {
 				let total = 0
 				this.goodsList.map(item => {
 					total = total + item.buyQty * item.goods.sellGold
 				})
 				return total 
+			},
+			// 收货地址
+			receiveAddress() { 
+				if (this.userInfo.receiveAreasName) {
+					let area = this.userInfo.receiveAreasName.split(',')
+					return area[0]+area[1]+area[2]+this.userInfo.receiveAddress
+				}
 			}
 		},
 		methods: {
@@ -230,8 +238,9 @@
 							buyQty: item.buyQty
 						}
 					})
+					
 					let params = {
-						receiveAddress: this.userInfo.receiveAddress,
+						receiveAddress: this.receiveAddress,
 						receiverName: this.userInfo.receiverName,
 						receiverPhone: this.userInfo.receiverPhone,
 						orderGoodsList: orderGoodsList,

+ 1 - 1
pages/userCenter/zhinan.vue

@@ -4,7 +4,7 @@
 			<!-- 新手引导 -->
 			<view class="lc-container-xs">
 				<view class="lc-container-title" style="margin-top: 0;">新手引导</view>
-				<view class="lc-container-step" style="margin-top: 0;">(<text>一</text>)、新手入</view>
+				<view class="lc-container-step" style="margin-top: 0;">(<text>一</text>)、新手入</view>
 				<view class="lc-container-step-name" style="font-weight: bold; font-size: 32rpx;margin: 20rpx 0;">用户登录</view>
 				<view class="lc-container-step-item">
 					(<text>1</text>)