msb-mca
/
shop-app
2.1k
2
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev1.0.0' into develop

Browse Source
msb_beta
ch 3 years ago
parent 61a45c1eb3 88bb44cc41
commit 83f69dd5e2
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
common/utils/requset.js
Unescape View File

@ -2,14 +2,14 @@
* @Author: ch
* @Date: 2022-03-17 17:42:32
* @LastEditors: ch
* @LastEditTime: 2022-04-29 15:15:55
* @LastEditTime: 2022-04-29 15:58:12
* @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
*/
import MsbUniRequest from '@/common/plugins/msbUniRequest';
import $store from '@/common/store';
const ENV = 'test';
const ENV = 'prod';
const BASE_URL = {
'test' : 'https://k8s-horse-gateway.mashibing.cn',
'dev' : '',

2
h5/index.html
Unescape View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.3016a170.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.ef44eb10.js></script></body></html>

2
h5/static/js/index.3016a170.js → h5/static/js/index.ef44eb10.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-goods-detail-index.04258da9.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-goods-detail-index.a8b0aa30.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-detail-index.50a1d52e.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-detail-index.717c2233.js
View File

File diff suppressed because one or more lines are too long

4
pages/goods/detail/index.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-23 17:27:21
* @LastEditors: ch
* @LastEditTime: 2022-04-27 21:16:21
* @LastEditTime: 2022-04-29 15:48:48
* @Description: file content
-->
<template>
@ -30,7 +30,7 @@
</SkuPopup>
</view>
<view class="goods-desc">
<mp-html :content="goods.content"/>
<mp-html :content="goods.detail"/>
</view>
<view class="footer">
<view class="footer--left">

4
pages/order/detail/components/StatusTips.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-31 17:53:43
* @LastEditors: ch
* @LastEditTime: 2022-04-28 16:26:46
* @LastEditTime: 2022-04-29 15:46:53
* @Description: file content
-->
<template>
@ -54,7 +54,7 @@ export default {
this.calcTimerStartSecondNum();
this.timer();
}else if(orderStatus === '2'){
}else if(orderStatus === 2){
this.ctxCon.tips = this.orderInfo.cancelReason;
}
}

Write Preview
Loading…
Cancel
Save