fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by lea guo
Commit dd225fb005c18f8ba0d6b32132f804e815666d14 1 parent fc9688bf

订单修改地址

Inline Side-by-side
Showing 5 changed files with 76 additions and 47 deletions
@@ -11,22 +11,27 @@ @@ -11,22 +11,27 @@
11 <slot name="item" :data="item"> 11 <slot name="item" :data="item">
12 <div class="user-item"> 12 <div class="user-item">
13 <div 13 <div
14 - :class="{'uncheck-item' : item.address_id !== selectedAddressId , 'check-item' : item.address_id === selectedAddressId }" 14 + :class="{
  15 + 'uncheck-item': item.address_id !== selectedAddressId,
  16 + 'check-item': item.address_id === selectedAddressId
  17 + }"
15 ></div> 18 ></div>
16 <div class="user-info"> 19 <div class="user-info">
17 <div class="extra"> 20 <div class="extra">
18 - <p class="name">{{item.consignee}}</p>  
19 - <p class="mobile">{{item.mobile}}</p> 21 + <p class="name">{{ item.consignee }}</p>
  22 + <p class="mobile">{{ item.mobile }}</p>
20 <div v-if="item.is_default === 'Y'" class="tag-btn">默认</div> 23 <div v-if="item.is_default === 'Y'" class="tag-btn">默认</div>
21 - <div v-if="item.tag_code" class="tag-btn">{{item.tag}}</div> 24 + <div v-if="item.tag_code" class="tag-btn">{{ item.tag }}</div>
22 <div 25 <div
23 class="option-btn" 26 class="option-btn"
24 :data-item="JSON.stringify(item)" 27 :data-item="JSON.stringify(item)"
25 :data-add="0" 28 :data-add="0"
26 @click="toEditorPage" 29 @click="toEditorPage"
27 - >编辑</div> 30 + >
  31 + 编辑
  32 + </div>
28 </div> 33 </div>
29 - <p class="address">{{item.area}}{{item.address}}</p> 34 + <p class="address">{{ item.area }}{{ item.address }}</p>
30 </div> 35 </div>
31 </div> 36 </div>
32 </slot> 37 </slot>
@@ -100,8 +105,7 @@ export default { @@ -100,8 +105,7 @@ export default {
100 name: "addressEdit", 105 name: "addressEdit",
101 params: { 106 params: {
102 item: item, 107 item: item,
103 - update: !isAdd,  
104 - title: isAdd ? "添加地址" : "编辑地址" 108 + update: !isAdd
105 } 109 }
106 }); 110 });
107 } 111 }
@@ -11,7 +11,12 @@ @@ -11,7 +11,12 @@
11 ></CInput> 11 ></CInput>
12 </FormItem> 12 </FormItem>
13 <FormItem> 13 <FormItem>
14 - <CInput label="手机号" place-holder="请填写手机号" v-model="model.mobile" :textValue="model.mobile"></CInput> 14 + <CInput
  15 + label="手机号"
  16 + place-holder="请填写手机号"
  17 + v-model="model.mobile"
  18 + :textValue="model.mobile"
  19 + ></CInput>
15 </FormItem> 20 </FormItem>
16 21
17 <template> 22 <template>
@@ -20,7 +25,7 @@ @@ -20,7 +25,7 @@
20 <label class="input-label">所在区域</label> 25 <label class="input-label">所在区域</label>
21 <div class="wrapper-arrow" @click="chooseArea"> 26 <div class="wrapper-arrow" @click="chooseArea">
22 <template v-if="model.area"> 27 <template v-if="model.area">
23 - <label class="text-label">{{model.area}}</label> 28 + <label class="text-label">{{ model.area }}</label>
24 </template> 29 </template>
25 <template v-else> 30 <template v-else>
26 <label class="choose-area">请选择</label> 31 <label class="choose-area">请选择</label>
@@ -39,30 +44,32 @@ @@ -39,30 +44,32 @@
39 :textValue="model.address" 44 :textValue="model.address"
40 ></CInput> 45 ></CInput>
41 </FormItem> 46 </FormItem>
42 -  
43 - <div class="wrapper-tag"> 47 + <!-- 订单修改地址隐藏 -->
  48 + <div v-if="!$route.params.code" class="wrapper-tag">
44 <p class="tag-text">设置标签：</p> 49 <p class="tag-text">设置标签：</p>
45 <RadioGroup class="wrapper-radio"> 50 <RadioGroup class="wrapper-radio">
46 <div v-for="(tag, index) in addressTags" :key="index"> 51 <div v-for="(tag, index) in addressTags" :key="index">
47 <Radio 52 <Radio
48 class="tag-radio" 53 class="tag-radio"
49 - :label="{text: `${tag.name}`, value: `${tag.code}`}" 54 + :label="{ text: `${tag.name}`, value: `${tag.code}` }"
50 v-model="model.tag_code" 55 v-model="model.tag_code"
51 checked="tag.code === model.tag_code" 56 checked="tag.code === model.tag_code"
52 ></Radio> 57 ></Radio>
53 </div> 58 </div>
54 </RadioGroup> 59 </RadioGroup>
55 </div> 60 </div>
56 -  
57 - <div class="wrapper-del"> 61 + <!-- 订单修改地址隐藏 -->
  62 + <div v-if="!$route.params.code" class="wrapper-del">
58 <Radio 63 <Radio
59 class="radio" 64 class="radio"
60 - :label="{text: '设为默认地址', value: true}" 65 + :label="{ text: '设为默认地址', value: true }"
61 style="flex: 0 1 100%;" 66 style="flex: 0 1 100%;"
62 checked="model.is_default" 67 checked="model.is_default"
63 v-model="model.is_default" 68 v-model="model.is_default"
64 ></Radio> 69 ></Radio>
65 - <div v-if="isUpdate" class="del-address" @click="delAddress">删除地址</div> 70 + <div v-if="isUpdate" class="del-address" @click="delAddress">
  71 + 删除地址
  72 + </div>
66 </div> 73 </div>
67 74
68 <div :class="submitClass" @touchend="onSubmit">确 认</div> 75 <div :class="submitClass" @touchend="onSubmit">确 认</div>
@@ -279,26 +286,24 @@ export default { @@ -279,26 +286,24 @@ export default {
279 }, 286 },
280 287
281 activated() { 288 activated() {
282 - this.fetchAddressTags();  
283 -  
284 - this.isUpdate = this.$route.params.update;  
285 - this.title = this.$route.params.title  
286 - ? this.$route.params.title  
287 - : "添加地址"; 289 + let { update, title, item, code } = this.$route.params;
  290 + // 订单编辑 不查标签
  291 + if (!code) {
  292 + this.fetchAddressTags();
  293 + }
288 294
289 - if (this.$route.params.update) {  
290 - let item = JSON.parse(this.$route.params.item);  
291 - if (item) {  
292 - let that = this;  
293 - that.model.consignee = item.consignee;  
294 - that.model.address_id = item.address_id;  
295 - that.model.mobile = item.mobile;  
296 - that.model.area_code = item.area_code;  
297 - that.model.area = item.area;  
298 - that.model.address = item.address;  
299 - that.model.tag_code = item.tag_code;  
300 - that.model.is_default = item.is_default === "Y" ? true : false;  
301 - } 295 + this.isUpdate = update;
  296 + this.title = update ? "编辑地址" : "添加地址";
  297 + if (update) {
  298 + item = JSON.parse(item || "{}");
  299 + this.model.consignee = item.consignee;
  300 + this.model.address_id = item.address_id;
  301 + this.model.mobile = item.mobile;
  302 + this.model.area_code = item.area_code;
  303 + this.model.area = item.area;
  304 + this.model.address = item.address;
  305 + this.model.tag_code = item.tag_code;
  306 + this.model.is_default = item.is_default === "Y" ? true : false;
302 } else { 307 } else {
303 this.model = {}; 308 this.model = {};
304 } 309 }
1 -export default [{  
2 - name: 'address',  
3 - path: '/xianyu/address',  
4 - component: () => import(/* webpackChunkName: "address" */ './address')  
5 -}, {  
6 - name: 'addressEdit',  
7 - path: '/xianyu/address/edit',  
8 - component: () => import(/* webpackChunkName: "address" */ './addressEdit')  
9 -}]; 1 +export default [
  2 + {
  3 + name: 'address',
  4 + path: '/xianyu/address',
  5 + component: () => import(/* webpackChunkName: "address" */ './address'),
  6 + },
  7 + {
  8 + name: 'addressEdit',
  9 + path: '/xianyu/address/edit/:code?', // code 订单编码
  10 + component: () => import(/* webpackChunkName: "address" */ './addressEdit'),
  11 + },
  12 +];
@@ -37,7 +37,12 @@ export default { @@ -37,7 +37,12 @@ export default {
37 ]), 37 ]),
38 onActionHandler(action) { 38 onActionHandler(action) {
39 const { owner = ownType.SELL } = this.$route.params; 39 const { owner = ownType.SELL } = this.$route.params;
40 - const { orderCode, priceInfo = {}, goodsInfo = {} } = this.order; 40 + const {
  41 + orderCode,
  42 + priceInfo = {},
  43 + goodsInfo = {},
  44 + addressInfo = {}
  45 + } = this.order;
41 46
42 const { productId, storageId, skup } = goodsInfo; 47 const { productId, storageId, skup } = goodsInfo;
43 48
@@ -100,6 +105,18 @@ export default { @@ -100,6 +105,18 @@ export default {
100 }); 105 });
101 break; 106 break;
102 107
  108 + // 修改地址
  109 + case orderActionsMap.MODIFY_ADDRESS.name:
  110 + this.$router.push({
  111 + name: "addressEdit",
  112 + params: {
  113 + code: orderCode,
  114 + update: true,
  115 + item: JSON.stringify(addressInfo)
  116 + }
  117 + });
  118 + break;
  119 +
103 default: 120 default:
104 this.$emit("on-action", action); 121 this.$emit("on-action", action);
105 } 122 }
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 v-show="!isShowEmpty" 9 v-show="!isShowEmpty"
10 > 10 >
11 <ul class="list-wrapper"> 11 <ul class="list-wrapper">
12 - <li v-for="order in orderList" :key="order.orderCode"> 12 + <li v-for="order in orderList" :key="order.secendLevelCreateTime">
13 <order-info :order="order" /> 13 <order-info :order="order" />
14 <order-list-item :order="order" /> 14 <order-list-item :order="order" />
15 <!-- 订单操作 --> 15 <!-- 订单操作 -->