fe / yohoblk-wap · Commits

Go to a project

Authored by 陈轩
Commit 97540bca41533861feece949bafc0f9cb3be4d3a 2 parents 71e13aee b93c53c7

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 16 changed files with 168 additions and 91 deletions
@@ -9,13 +9,13 @@ const api = global.yoho.API; @@ -9,13 +9,13 @@ const api = global.yoho.API;
9 9
10 const yhChannel = { 10 const yhChannel = {
11 men: { 11 men: {
12 - channel: '1' 12 + channel: '301'
13 }, 13 },
14 women: { 14 women: {
15 - channel: '2' 15 + channel: '302'
16 }, 16 },
17 lifestyle: { 17 lifestyle: {
18 - channel: '4' 18 + channel: '303'
19 } 19 }
20 }; 20 };
21 21
@@ -21,13 +21,16 @@ const handleBrandList = origin => { @@ -21,13 +21,16 @@ const handleBrandList = origin => {
21 indexList: [] 21 indexList: []
22 }; 22 };
23 23
  24 + _.sortBy(origin, (o) => {
  25 + return o.key;
  26 + });
  27 +
24 _.forEach(origin, (value, key) => { 28 _.forEach(origin, (value, key) => {
25 let brands = []; 29 let brands = [];
26 30
27 _.forEach(value, (subValue) => { 31 _.forEach(value, (subValue) => {
28 brands.push({ 32 brands.push({
29 - name: subValue.brand_name,  
30 - link: '/brand/' + subValue.brand_domain, 33 + name: subValue.brand_name_en || subValue.brand_name_cn || subValue.brand_name,
31 logo: subValue.brand_ico, 34 logo: subValue.brand_ico,
32 domain: subValue.brand_domain 35 domain: subValue.brand_domain
33 }); 36 });
@@ -69,9 +72,7 @@ const getBrandListData = params => { @@ -69,9 +72,7 @@ const getBrandListData = params => {
69 * @returns {*|Promise.<TResult>} 72 * @returns {*|Promise.<TResult>}
70 */ 73 */
71 const getCateListData = params => { 74 const getCateListData = params => {
72 - return brandApi.getCateListData(params).then(result => {  
73 - return camelCase(result);  
74 - }); 75 + return brandApi.getCateListData(params).then(camelCase);
75 }; 76 };
76 77
77 module.exports = { 78 module.exports = {
@@ -34,13 +34,12 @@ const refund = { @@ -34,13 +34,12 @@ const refund = {
34 }).catch(next); 34 }).catch(next);
35 }, 35 },
36 logistics(req, res, next) { 36 logistics(req, res, next) {
37 - const applyid = req.query.applyid;  
38 -  
39 refundModel.getExpressCompany().then(result => { 37 refundModel.getExpressCompany().then(result => {
40 res.render('logistics', { 38 res.render('logistics', {
41 module: 'me', 39 module: 'me',
42 page: 'logistics', 40 page: 'logistics',
43 - applyid: applyid, 41 + applyid: req.query.applyid,
  42 + type: req.query.type,
44 company_list: result ? JSON.stringify(result.data) : '' 43 company_list: result ? JSON.stringify(result.data) : ''
45 }); 44 });
46 }).catch(next); 45 }).catch(next);
@@ -48,11 +47,13 @@ const refund = { @@ -48,11 +47,13 @@ const refund = {
48 saveLogistics(req, res, next) { 47 saveLogistics(req, res, next) {
49 const uid = req.user.uid; 48 const uid = req.user.uid;
50 const applyid = req.body.applyid; 49 const applyid = req.body.applyid;
51 - const expressCompany = req.body.expressCompany;  
52 - const expressId = req.body.expressId;  
53 - const expressNumber = req.body.expressNumber;  
54 50
55 - refundModel.setexpress(applyid, uid, expressCompany, expressId, expressNumber).then(data => { 51 + refundModel.setexpress(applyid, uid, {
  52 + type: req.body.type,
  53 + expressCompany: req.body.expressCompany,
  54 + expressNumber: req.body.expressNumber,
  55 + expressId: req.body.expressId
  56 + }).then(data => {
56 return res.json(data); 57 return res.json(data);
57 }).catch(next); 58 }).catch(next);
58 }, 59 },
@@ -32,14 +32,16 @@ const refund = { @@ -32,14 +32,16 @@ const refund = {
32 code: 200 32 code: 200
33 }); 33 });
34 }, 34 },
35 - setexpress(applyid, uid, expressCompany, expressId, expressNumber) { 35 + setexpress(applyid, uid, data) {
  36 + const method = data.type === 'refund' ? 'app.refund.setexpress' : 'app.change.setexpress';
  37 +
36 return api.get('', { 38 return api.get('', {
37 - method: 'app.refund.setexpress', 39 + method: method,
38 id: applyid, 40 id: applyid,
39 uid: uid, 41 uid: uid,
40 - express_company: expressCompany,  
41 - express_number: expressNumber,  
42 - express_id: expressId 42 + express_company: data.expressCompany,
  43 + express_number: data.expressNumber,
  44 + express_id: data.expressId
43 }); 45 });
44 }, 46 },
45 getChangeDetail(id, uid) { 47 getChangeDetail(id, uid) {
1 <div class="logistics-page" id="logistics"> 1 <div class="logistics-page" id="logistics">
2 - <components :is="currentView" :company_id="company_id" :company_name="company_name" applyid='{{applyid}}' company_list='{{company_list}}' keep-alive></components> 2 + <components :is="currentView" :company_id="company_id" :company_name="company_name" applyid='{{applyid}}' type='{{type}}' company_list='{{company_list}}' keep-alive></components>
3 </div> 3 </div>
@@ -5,11 +5,7 @@ @@ -5,11 +5,7 @@
5 */ 5 */
6 'use strict'; 6 'use strict';
7 7
8 -// const _ = require('lodash');  
9 -  
10 -// const helpers = global.yoho.helpers;  
11 const api = global.yoho.API; 8 const api = global.yoho.API;
12 -const camelCase = global.yoho.camelCase;  
13 9
14 /** 10 /**
15 * 商品详情 11 * 商品详情
@@ -272,7 +272,7 @@ const intercept = (url) => { @@ -272,7 +272,7 @@ const intercept = (url) => {
272 } 272 }
273 273
274 // 首页 274 // 首页
275 - if (/\/$/.test(path)) { 275 + if (/\/$/.test(path) || !path) {
276 return yoho.goTab({ 276 return yoho.goTab({
277 index: 0, 277 index: 0,
278 url: /^(https?:)?\/\//i.test(url) ? url : origin + url 278 url: /^(https?:)?\/\//i.test(url) ? url : origin + url
@@ -5,12 +5,13 @@ var util = require('common/util'); @@ -5,12 +5,13 @@ var util = require('common/util');
5 $(() => { 5 $(() => {
6 window.addEventListener('touchmove', function() { 6 window.addEventListener('touchmove', function() {
7 var topHeight = document.body.scrollTop; 7 var topHeight = document.body.scrollTop;
  8 +
8 if (topHeight > 50) { 9 if (topHeight > 50) {
9 $('#header').addClass('top-change'); 10 $('#header').addClass('top-change');
10 } else { 11 } else {
11 $('#header').removeClass('top-change'); 12 $('#header').removeClass('top-change');
12 } 13 }
13 - }) 14 + });
14 15
15 if (!yoho.isLogin) { 16 if (!yoho.isLogin) {
16 $('.auth').addClass('no-intercept'); 17 $('.auth').addClass('no-intercept');
@@ -8,6 +8,8 @@ @@ -8,6 +8,8 @@
8 const tab = require('channel/tab.vue'); 8 const tab = require('channel/tab.vue');
9 const $ = require('jquery'); 9 const $ = require('jquery');
10 const bus = require('common/vue-bus'); 10 const bus = require('common/vue-bus');
  11 + const qs = require('yoho-qs');
  12 + const cookie = require('yoho-cookie');
11 13
12 const channelTrans = { 14 const channelTrans = {
13 men: { 15 men: {
@@ -29,7 +31,8 @@ @@ -29,7 +31,8 @@
29 return { 31 return {
30 category: [], 32 category: [],
31 categoryResult: {}, 33 categoryResult: {},
32 - gender: '1,3' 34 + gender: '1,3',
  35 + detaultChannel: qs.channel || cookie.get('_Channel') || 'men'
33 }; 36 };
34 }, 37 },
35 components: { 38 components: {
@@ -44,7 +47,7 @@ @@ -44,7 +47,7 @@
44 }).then(result => { 47 }).then(result => {
45 if (result.code === 200 && result.data) { 48 if (result.code === 200 && result.data) {
46 this.$set('categoryResult', result.data); 49 this.$set('categoryResult', result.data);
47 - this.$set('category', this.categoryResult['MEN男士']); 50 + this.$set('category', this.categoryResult[channelTrans[this.detaultChannel].key]);
48 } 51 }
49 }).fail(() => { 52 }).fail(() => {
50 tip('网络错误'); 53 tip('网络错误');
@@ -55,8 +58,9 @@ @@ -55,8 +58,9 @@
55 this.getCateList(); 58 this.getCateList();
56 59
57 bus.$on('channel.change', (page, channel) => { 60 bus.$on('channel.change', (page, channel) => {
58 - this.$set('gender', channelTrans[channel].code);  
59 - this.$set('category', this.categoryResult[channelTrans[channel].key]); 61 + this.$set('detaultChannel', channel || qs.channel || cookie.get('_Channel') || 'men');
  62 + this.$set('gender', channelTrans[this.detaultChannel].code);
  63 + this.$set('category', this.categoryResult[channelTrans[this.detaultChannel].key]);
60 }); 64 });
61 } 65 }
62 }; 66 };
@@ -244,7 +244,7 @@ @@ -244,7 +244,7 @@
244 }); 244 });
245 245
246 if (yoho.isApp) { 246 if (yoho.isApp) {
247 - bus.$on('app.favourite.tabChange', this.updateNavBar); 247 + bus.$on('app.favourite.tabChange', this.updateNavBar);
248 } 248 }
249 } 249 }
250 }; 250 };
@@ -81,14 +81,37 @@ @@ -81,14 +81,37 @@
81 }; 81 };
82 }, 82 },
83 created() { 83 created() {
  84 + this.updateNavBar();
84 this.getOrderData(); 85 this.getOrderData();
85 86
86 yohoAPI.addNativeMethod('goToService', () => { 87 yohoAPI.addNativeMethod('goToService', () => {
87 interceptClick.intercept('/me/service'); 88 interceptClick.intercept('/me/service');
88 return false; 89 return false;
89 }); 90 });
  91 +
  92 + document.addEventListener('visibilitychange', () => {
  93 + if (!document.hidden) {
  94 + this.reload();
  95 + }
  96 + });
90 }, 97 },
91 methods: { 98 methods: {
  99 + updateNavBar() {
  100 + const header = $.extend({}, interceptClick.defaultTitleMap[2]);
  101 +
  102 + header.title.des = '订单详情';
  103 + yoho.updateNavigationBar({
  104 + header: header
  105 + });
  106 + },
  107 + reload() {
  108 + this.show = false;
  109 + this.order = {};
  110 + this.selected = {};
  111 + this.cancelbusy = false;
  112 +
  113 + this.getOrderData();
  114 + },
92 getOrderData() { 115 getOrderData() {
93 $.ajax({ 116 $.ajax({
94 url: '/me/get-order', 117 url: '/me/get-order',
@@ -139,7 +162,10 @@ @@ -139,7 +162,10 @@
139 reason: this.selected.reason || this.options[0].reason 162 reason: this.selected.reason || this.options[0].reason
140 }, (result) => { 163 }, (result) => {
141 if (result.code === 200) { 164 if (result.code === 200) {
142 - location.reload(); 165 + tip('取消成功');
  166 + setTimeout(() => {
  167 + this.reload();
  168 + }, 1000);
143 } else if (result.code !== 500) { 169 } else if (result.code !== 500) {
144 tip(result.message); 170 tip(result.message);
145 } 171 }
@@ -178,7 +204,7 @@ @@ -178,7 +204,7 @@
178 reason: this.options.length ? this.options[0].reason : null 204 reason: this.options.length ? this.options[0].reason : null
179 }, (result) => { 205 }, (result) => {
180 if (result.code === 200) { 206 if (result.code === 200) {
181 - location.reload(); 207 + this.reload();
182 } 208 }
183 }); 209 });
184 }; 210 };
@@ -202,7 +228,7 @@ @@ -202,7 +228,7 @@
202 } 228 }
203 }).then(result => { 229 }).then(result => {
204 if (result.code === 200) { 230 if (result.code === 200) {
205 - yohoAPI.goBack(true); 231 + yohoAPI.goBack();
206 return false; 232 return false;
207 } else if (result.code !== 500) { 233 } else if (result.code !== 500) {
208 tip(result.message); 234 tip(result.message);
@@ -213,7 +239,9 @@ @@ -213,7 +239,9 @@
213 }); 239 });
214 }, 240 },
215 confirmGoods(code) { 241 confirmGoods(code) {
216 - Modal.confirm('', '确认收货', function() { 242 + let _this = this;
  243 +
  244 + Modal.confirm('', '确认收货吗？', function() {
217 this.hide(); 245 this.hide();
218 $.ajax({ 246 $.ajax({
219 url: '/me/confirmReceive', 247 url: '/me/confirmReceive',
@@ -223,7 +251,7 @@ @@ -223,7 +251,7 @@
223 } 251 }
224 }).then(result => { 252 }).then(result => {
225 if (result.code === 200) { 253 if (result.code === 200) {
226 - location.reload(); 254 + _this.reload();
227 } else if (result.code !== 500) { 255 } else if (result.code !== 500) {
228 tip(result.message); 256 tip(result.message);
229 } 257 }
@@ -73,22 +73,38 @@ @@ -73,22 +73,38 @@
73 limit: 10, 73 limit: 10,
74 pageTotal: 1, 74 pageTotal: 1,
75 type: this.$parent.$data.type, 75 type: this.$parent.$data.type,
76 - orderList: [],  
77 busy: false, 76 busy: false,
  77 + cancelbusy: false,
78 emptybox: 'hide', 78 emptybox: 'hide',
  79 + currentCode: '',
79 selected: {}, 80 selected: {},
80 options: [], 81 options: [],
81 - currentCode: '',  
82 - cancelbusy: false 82 + orderList: []
83 }; 83 };
84 }, 84 },
85 -  
86 - ready() { 85 + created() {
87 this.getOrderData(); 86 this.getOrderData();
88 this.getCancelReason(); 87 this.getCancelReason();
89 - },  
90 88
  89 + document.addEventListener('visibilitychange', () => {
  90 + if (!document.hidden) {
  91 + this.reload();
  92 + }
  93 + });
  94 + },
91 methods: { 95 methods: {
  96 + reload() {
  97 + this.page = 0;
  98 + this.pageTotal = 1;
  99 + this.busy = false;
  100 + this.cancelbusy = false;
  101 + this.emptybox = 'hide';
  102 + this.currentCode = '';
  103 + this.selected = {};
  104 + this.orderList = [];
  105 +
  106 + this.getOrderData();
  107 + },
92 getOrderData() { 108 getOrderData() {
93 this.busy = true; 109 this.busy = true;
94 if (this.page >= this.pageTotal) { 110 if (this.page >= this.pageTotal) {
@@ -127,7 +143,10 @@ @@ -127,7 +143,10 @@
127 reason: this.selected.reason || this.options[0].reason 143 reason: this.selected.reason || this.options[0].reason
128 }, (result) => { 144 }, (result) => {
129 if (result.code === 200) { 145 if (result.code === 200) {
130 - location.reload(); 146 + tip('取消成功');
  147 + setTimeout(() => {
  148 + this.reload();
  149 + }, 1000);
131 } else if (result.code !== 500) { 150 } else if (result.code !== 500) {
132 tip(result.message); 151 tip(result.message);
133 } 152 }
@@ -155,7 +174,7 @@ @@ -155,7 +174,7 @@
155 reason: this.options.length ? this.options[0].reason : null 174 reason: this.options.length ? this.options[0].reason : null
156 }, (result) => { 175 }, (result) => {
157 if (result.code === 200) { 176 if (result.code === 200) {
158 - location.reload(); 177 + this.reload();
159 } 178 }
160 }); 179 });
161 }; 180 };
@@ -206,7 +225,9 @@ @@ -206,7 +225,9 @@
206 }); 225 });
207 }, 226 },
208 confirmGoods(code) { 227 confirmGoods(code) {
209 - Modal.confirm('', '确认收货', function() { 228 + let _this = this;
  229 +
  230 + Modal.confirm('', '确认收货吗？', function() {
210 this.hide(); 231 this.hide();
211 $.ajax({ 232 $.ajax({
212 url: '/me/confirmReceive', 233 url: '/me/confirmReceive',
@@ -216,7 +237,7 @@ @@ -216,7 +237,7 @@
216 } 237 }
217 }).then(result => { 238 }).then(result => {
218 if (result.code === 200) { 239 if (result.code === 200) {
219 - location.reload(); 240 + _this.reload();
220 } else if (result.code !== 500) { 241 } else if (result.code !== 500) {
221 tip(result.message); 242 tip(result.message);
222 } 243 }
@@ -65,10 +65,25 @@ @@ -65,10 +65,25 @@
65 emptybox: 'hide' 65 emptybox: 'hide'
66 }; 66 };
67 }, 67 },
68 - ready() {  
69 - this.getRefundData(); 68 + created() {
  69 + this.reload();
  70 +
  71 + document.addEventListener('visibilitychange', () => {
  72 + if (!document.hidden) {
  73 + this.reload();
  74 + }
  75 + });
70 }, 76 },
71 methods: { 77 methods: {
  78 + reload() {
  79 + this.page= 0;
  80 + this.pageTotal = 1;
  81 + this.orderList= [];
  82 + this.busy= false;
  83 + this.emptybox= 'hide';
  84 +
  85 + this.getRefundData();
  86 + },
72 getRefundData() { 87 getRefundData() {
73 this.busy = true; 88 this.busy = true;
74 if (this.page >= this.pageTotal) { 89 if (this.page >= this.pageTotal) {
@@ -94,14 +109,13 @@ @@ -94,14 +109,13 @@
94 tip('网络错误'); 109 tip('网络错误');
95 }); 110 });
96 }, 111 },
97 - /**  
98 - * 取消申请  
99 - * @param id  
100 - * @param type refundType 1为退货,2为换货  
101 - */  
102 cancelApply(id, type) { 112 cancelApply(id, type) {
  113 + let _this = this;
  114 +
103 Modal.confirm('', '确认取消吗？', function() { 115 Modal.confirm('', '确认取消吗？', function() {
104 this.hide(); 116 this.hide();
  117 +
  118 + // type refundType 1为退货,2为换货
105 $.ajax({ 119 $.ajax({
106 url: '/me/return/' + (Number(type) === 2 ? 'exchange' : 'refund') + '/cancel-apply', 120 url: '/me/return/' + (Number(type) === 2 ? 'exchange' : 'refund') + '/cancel-apply',
107 type: 'post', 121 type: 'post',
@@ -110,7 +124,10 @@ @@ -110,7 +124,10 @@
110 } 124 }
111 }).then(result => { 125 }).then(result => {
112 if (result.code === 200) { 126 if (result.code === 200) {
113 - location.reload(); 127 + tip('取消成功');
  128 + setTimeout(() => {
  129 + _this.reload();
  130 + }, 1000);
114 } else { 131 } else {
115 tip(result.message); 132 tip(result.message);
116 } 133 }
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 </div> 31 </div>
32 <div v-if="(detail.deliveryTpye === '10' || type ==='refund') && detail.status == 10" 32 <div v-if="(detail.deliveryTpye === '10' || type ==='refund') && detail.status == 10"
33 class="logistics"> 33 class="logistics">
34 - <a href="/me/return/logistics?applyid={{applyid}}">填写商品寄回的快递信息</a> 34 + <a href="/me/return/logistics?applyid={{applyid}}&type={{type}}">填写商品寄回的快递信息</a>
35 </div> 35 </div>
36 </div> 36 </div>
37 <div class="exchange-details"> 37 <div class="exchange-details">
@@ -125,9 +125,41 @@ @@ -125,9 +125,41 @@
125 }; 125 };
126 }, 126 },
127 methods: { 127 methods: {
  128 + reload() {
  129 + this.id = '';
  130 + this.sourceOrderCode = '';
  131 + this.show = false;
  132 + this.detail = {};
  133 +
  134 + $.ajax({
  135 + url: '/me/return/status-detail',
  136 + data: {
  137 + applyid: this.applyid,
  138 + type: this.type
  139 + }
  140 + }).then(res => {
  141 + if (res.code === 200) {
  142 + this.show = true;
  143 + this.detail = res.data;
  144 + if (!this.detail.goodsList) {
  145 + return;
  146 + }
  147 +
  148 + this.id = this.detail.id;
  149 + this.sourceOrderCode = this.detail.sourceOrderCode;
  150 + } else if (result.code !== 500) {
  151 + tip(result.message);
  152 + } else {
  153 + tip('数据获取失败');
  154 + }
  155 + }).fail(() => {
  156 + tip('网络错误');
  157 + });
  158 + },
128 cancel() { 159 cancel() {
129 let id = this.id; 160 let id = this.id;
130 let url = ''; 161 let url = '';
  162 + let _this = this;
131 163
132 if (!id) { 164 if (!id) {
133 return false; 165 return false;
@@ -138,6 +170,7 @@ @@ -138,6 +170,7 @@
138 url = '/me/return/exchange/cancel-apply'; 170 url = '/me/return/exchange/cancel-apply';
139 } 171 }
140 172
  173 +
141 Modal.confirm('', '确认取消吗？', function() { 174 Modal.confirm('', '确认取消吗？', function() {
142 this.hide(); 175 this.hide();
143 $.ajax({ 176 $.ajax({
@@ -148,7 +181,7 @@ @@ -148,7 +181,7 @@
148 } 181 }
149 }).then(data => { 182 }).then(data => {
150 if (data.code === 200) { 183 if (data.code === 200) {
151 - location.reload(); 184 + _this.reload();
152 } else { 185 } else {
153 tip(data.message); 186 tip(data.message);
154 } 187 }
@@ -157,39 +190,11 @@ @@ -157,39 +190,11 @@
157 } 190 }
158 }, 191 },
159 created() { 192 created() {
160 - $.ajax({  
161 - url: '/me/return/status-detail',  
162 - data: {  
163 - applyid: this.applyid,  
164 - type: this.type  
165 - }  
166 - }).then(res => {  
167 - if (res.code === 200) {  
168 - this.show = true;  
169 - this.detail = res.data;  
170 - if (!this.detail.goodsList) {  
171 - return;  
172 - }  
173 -  
174 - this.id = this.detail.id;  
175 - this.sourceOrderCode = this.detail.sourceOrderCode;  
176 - this.detail.goodsList.forEach(d => {  
177 - // d.evidenceImages = d.evidenceImages.map(p => {  
178 - // return util.getImgHost(p) + '?imageView2/2/w/154/h/154';  
179 - // })  
180 - });  
181 - } else if (result.code !== 500) {  
182 - tip(result.message);  
183 - } else {  
184 - tip('数据获取失败');  
185 - }  
186 - }).fail(() => {  
187 - tip('网络错误');  
188 - }); 193 + this.reload();
189 194
190 - document.addEventListener('visibilitychange', function() { 195 + document.addEventListener('visibilitychange', () => {
191 if (!document.hidden) { 196 if (!document.hidden) {
192 - location.reload(); 197 + this.reload();
193 } 198 }
194 }); 199 });
195 } 200 }
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 const yoho = require('yoho'); 20 const yoho = require('yoho');
21 21
22 module.exports = { 22 module.exports = {
23 - props: ['applyid', 'company_id', 'company_name'], 23 + props: ['applyid', 'type', 'company_id', 'company_name'],
24 data() { 24 data() {
25 return { 25 return {
26 num: '', 26 num: '',
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@
47 url: '/me/return/save-logistics', 47 url: '/me/return/save-logistics',
48 data: { 48 data: {
49 applyid: this.applyid, 49 applyid: this.applyid,
  50 + type: this.type,
50 expressId: this.company_id, 51 expressId: this.company_id,
51 expressCompany: this.company_name, 52 expressCompany: this.company_name,
52 expressNumber: this.num 53 expressNumber: this.num
@@ -58,7 +59,7 @@ @@ -58,7 +59,7 @@
58 if (res.code !== 200) { 59 if (res.code !== 200) {
59 tip(res.message || '网络错误'); 60 tip(res.message || '网络错误');
60 } else { 61 } else {
61 - yoho.goBack(true); 62 + yoho.goBack();
62 } 63 }
63 }); 64 });
64 return false; 65 return false;
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 title: result.shopName, 90 title: result.shopName,
91 des: shareSubTitle, 91 des: shareSubTitle,
92 url: shareUrl, 92 url: shareUrl,
93 - img: result.shopBg, 93 + img: result.shopLogo ? result.shopLogo : '',
94 isBlkShop: result.isBlkShop, 94 isBlkShop: result.isBlkShop,
95 domain: locationQuery.domain, 95 domain: locationQuery.domain,
96 brandName: result.brandName, 96 brandName: result.brandName,