@hbisty/qj-common 5.0.6 → 5.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hbisty/qj-common",
3
- "version": "5.0.6",
3
+ "version": "5.0.8",
4
4
  "description": "common files && template for qj-paas",
5
5
  "scripts": {
6
6
  "gulp": "gulp css"
@@ -224,13 +224,14 @@ export default {
224
224
  const merGoodsPage = "/paas/merchant-pc/index.html#/goodsList?goodsNo=" + expData.goodsCode;
225
225
  content = content.replace(expData.goodsCode, `<a href="${merGoodsPage}">${expData.goodsCode}</a>`)
226
226
  }
227
- if (expData.contractBillcode) { //订单列表
228
- const merOrderPage = "/paas/welfare-bus-pc/index.html#/orderListAll?contractBillcode=" + expData.contractBillcode;
229
- content = content.replace(expData.contractBillcode, `<a href="${merOrderPage}">${expData.contractBillcode}</a>`)
230
- }
231
- if (expData.contractBillcode) { //退单列表
232
- const merReturnPage = "/paas/merchant-pc/index.html#/returnsList?orderNo=" + expData.contractBillcode;
233
- content = content.replace(expData.contractBillcode, `<a href="${merReturnPage}">${expData.contractBillcode}</a>`)
227
+ if (expData.contractBillcode) { //订单号
228
+ if (msg.mnslistBustypeExt === 'mer_service_after_sale_audit') { //退单列表
229
+ const merReturnPage = "/paas/merchant-pc/index.html#/returnsList?orderNo=" + expData.contractBillcode;
230
+ content = content.replace(expData.contractBillcode, `<a href="${merReturnPage}">${expData.contractBillcode}</a>`)
231
+ } else { //订单列表
232
+ const merOrderPage = "/paas/welfare-bus-pc/index.html#/orderListAll?contractBillcode=" + expData.contractBillcode;
233
+ content = content.replace(expData.contractBillcode, `<a href="${merOrderPage}">${expData.contractBillcode}</a>`)
234
+ }
234
235
  }
235
236
  if (expData.businessDes1) { //应收账单列表
236
237
  const merReceivablePage = "/paas/bbc-bus-pc/index.html#/merchantReceivable?balancelistCode=" + expData.businessDes1;
@@ -246,13 +247,14 @@ export default {
246
247
  const buyPayablePage = "/paas/bbc-cli-pc/index.html#/user?toPath=payable&balancelistCode=" + expData.businessDes1;
247
248
  content = content.replace(expData.businessDes1, `<a href="${buyPayablePage}">${expData.businessDes1}</a>`)
248
249
  }
249
- if (expData.contractBillcode) { //订单列表
250
- const buyOrderPage = "/paas/bbc-cli-pc/index.html#/user?toPath=order&contractBillcode=" + expData.contractBillcode;
251
- content = content.replace(expData.contractBillcode, `<a href="${buyOrderPage}">${expData.contractBillcode}</a>`)
252
- }
253
- if (expData.contractBillcode) { //订单列表-订单号查询
254
- const buyOrderPage = "/paas/bbc-cli-pc/index.html#/user?toPath=order&contractBillcode=" + expData.contractBillcode;
255
- content = content.replace(expData.contractBillcode, `<a href="${buyOrderPage}">${expData.contractBillcode}</a>`)
250
+ if (expData.contractBillcode) { //订单号
251
+ if (msg.mnslistBustypeExt.includes('buy_service_after_sale')) { //售后列表
252
+ const buyRefundPage = "/paas/bbc-cli-pc/index.html#/user?toPath=afterSalesSales&contractBillcode=" + expData.contractBillcode;
253
+ content = content.replace(expData.contractBillcode, `<a href="${buyRefundPage}">${expData.contractBillcode}</a>`)
254
+ } else { //订单列表
255
+ const buyOrderPage = "/paas/bbc-cli-pc/index.html#/user?toPath=order&contractBillcode=" + expData.contractBillcode;
256
+ content = content.replace(expData.contractBillcode, `<a href="${buyOrderPage}">${expData.contractBillcode}</a>`)
257
+ }
256
258
  }
257
259
  if (expData.contractBbillcode) { //订单批次号查询
258
260
  if (msg.mnslistBustypeExt === 'buy_order_purchase_audit') { //请购审批
@@ -266,7 +268,9 @@ export default {
266
268
 
267
269
  }
268
270
  }
269
- return msg.content
271
+ return content
272
+ } else {
273
+ return ''
270
274
  }
271
275
  }
272
276
  }
@@ -141,11 +141,11 @@ export default {
141
141
  if (!current && this.current) {
142
142
  current = this.current;
143
143
  }
144
- if (this.$route.path && this.$route.meta) {
145
- if ('title' in this.$route.meta && 'icon' in this.$route.meta && 'menuCode' in this.$route.meta && 'params' in this.$route.meta) {
146
- sessionStorage.setItem('commonShowMenuAction', this.$route.path)
147
- }
148
- }
144
+ // if (this.$route.path && this.$route.meta) {
145
+ // if ('title' in this.$route.meta && 'icon' in this.$route.meta && 'menuCode' in this.$route.meta && 'params' in this.$route.meta) {
146
+ // sessionStorage.setItem('commonShowMenuAction', this.$route.path)
147
+ // }
148
+ // }
149
149
 
150
150
 
151
151
  console.log(current, 'current');
@@ -161,18 +161,18 @@ export default {
161
161
  console.log(current, 'path');
162
162
  console.log(path, 'path');
163
163
  console.log(sessionStorage.getItem('commonShowMenuAction'), this.$route, '当前路由信息');
164
- if (this.$route.name !== '首页' && this.$route.path !== '/404') {
165
- if (Object.keys(this.$route.meta) > 0) {
166
- if ('title' in this.$route.meta && 'icon' in this.$route.meta && 'menuCode' in this.$route.meta && 'params' in this.$route.meta) {
167
- path = path
168
- } else {
169
- path = sessionStorage.getItem('commonShowMenuAction') ? sessionStorage.getItem('commonShowMenuAction') : path
170
- }
171
- } else {
172
- path = sessionStorage.getItem('commonShowMenuAction') ? sessionStorage.getItem('commonShowMenuAction') : path
173
- }
164
+ // if (this.$route.name !== '首页' && this.$route.path !== '/404') {
165
+ // if (Object.keys(this.$route.meta) > 0) {
166
+ // if ('title' in this.$route.meta && 'icon' in this.$route.meta && 'menuCode' in this.$route.meta && 'params' in this.$route.meta) {
167
+ // path = path
168
+ // } else {
169
+ // path = sessionStorage.getItem('commonShowMenuAction') ? sessionStorage.getItem('commonShowMenuAction') : path
170
+ // }
171
+ // } else {
172
+ // path = sessionStorage.getItem('commonShowMenuAction') ? sessionStorage.getItem('commonShowMenuAction') : path
173
+ // }
174
174
 
175
- }
175
+ // }
176
176
 
177
177
  return path;
178
178
  },