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

修改APP兼容

Browse Source
msb_beta
ch 2 years ago
parent 4ec1f192f1
commit 1a0e1809c8
34 changed files with 203 additions and 89 deletions
Show Stats Download Patch File Download Diff File

2
common/utils/requset.js
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-17 17:42:32
* @LastEditors: ch
* @LastEditTime: 2022-05-05 19:00:38
* @LastEditTime: 2022-05-07 23:52:08
* @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
*/

9
components/UiGoodsGroup.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-07 17:22:44
* @LastEditors: ch
* @LastEditTime: 2022-05-06 22:23:01
* @LastEditTime: 2022-05-07 19:46:04
* @Description: file content
-->
@ -116,11 +116,8 @@ export default {
line-height: 36rpx;
font-weight: bold;
overflow:hidden;
text-overflow:ellipsis;
display:-webkit-box;
-webkit-box-orient:vertical;
-webkit-line-clamp:2;
max-height: 96rpx;
display: block;
max-height: 90rpx;
&__indent{
text-indent: 76rpx;
position: relative;

35
pages/account/address/edit.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-22 14:12:18
* @LastEditors: ch
* @LastEditTime: 2022-04-30 17:03:45
* @LastEditTime: 2022-05-07 19:07:02
* @Description: file content
-->
<template>
@ -99,17 +99,32 @@ export default {
this.$Router.back();
},
async delAddress(){
this.$msb.confirm({
content: '您确定要删除该地址吗？',
confirm: async ()=> {
const {error} = await ApiDeleteAddress({idList : this.$Route.query.id});
if(error){
uni.$u.toast(error.message);
return false;
uni.showModal({
content : '您确定要删除该地址吗？',
cancelColor : '#999',
confirmColor : '#3A83FB',
success : async ({confirm}) =>{
if(confirm){
const {error} = await ApiDeleteAddress({idList : this.$Route.query.id});
if(error){
uni.$u.toast(error.message);
return false;
}
this.$Router.back();
}
this.$Router.back();
}
}
})
// this.$msb.confirm({
// content: '您确定要删除该地址吗？',
// confirm: async ()=> {
// const {error} = await ApiDeleteAddress({idList : this.$Route.query.id});
// if(error){
// uni.$u.toast(error.message);
// return false;
// }
// this.$Router.back();
// }
// })
}
}

22
pages/account/setting/index.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-22 15:09:06
* @LastEditors: ch
* @LastEditTime: 2022-04-29 22:59:42
* @LastEditTime: 2022-05-07 19:21:28
* @Description: file content
-->
<template>
@ -28,14 +28,26 @@ export default {
},
methods:{
logout(){
this.$msb.confirm({
uni.showModal({
content : '是否退出登录？',
cancelText : '再看看',
confirm : ()=>{
this.$store.commit('SET_TOKEN');
this.$Router.replace('/login');
cancelColor : '#999',
confirmColor : '#3A83FB',
success:({confirm})=>{
if(confirm){
this.$store.commit('SET_TOKEN');
this.$Router.replace('/login');
}
}
})
// this.$msb.confirm({
// content : '是否退出登录？',
// cancelText : '再看看',
// confirm : ()=>{
// this.$store.commit('SET_TOKEN');
// this.$Router.replace('/login');
// }
// })
}
}

41
pages/cart/components/PageCtx.vue
Unescape View File

@ -316,21 +316,40 @@ export default {
return false
}
this.$msb.confirm({
uni.showModal({
content : '您确定要删除该商品吗？',
confirm : async ()=>{
const {error} = await ApiDeleteCartGoods({idList : ids.join(',')});
if(error){
uni.$u.toast(error.message);
return false;
cancelColor : '#999',
confirmColor : '#3A83FB',
success: async ({confirm}) => {
if(confirm){
const {error} = await ApiDeleteCartGoods({idList : ids.join(',')});
if(error){
uni.$u.toast(error.message);
return false;
}
this.delList = this.delList.filter(item => !ids.includes(item.id));
this.settlementList = this.settlementList.filter(item => !ids.includes(item.id));
this.checkedIds = [];
this.onClearInvalidId();
}
this.delList = this.delList.filter(item => !ids.includes(item.id));
this.settlementList = this.settlementList.filter(item => !ids.includes(item.id));
this.checkedIds = [];
this.onClearInvalidId();
}
})
// this.$msb.confirm({
// content : '您确定要删除该商品吗？',
// confirm : async ()=>{
// const {error} = await ApiDeleteCartGoods({idList : ids.join(',')});
// if(error){
// uni.$u.toast(error.message);
// return false;
// }
// this.delList = this.delList.filter(item => !ids.includes(item.id));
// this.settlementList = this.settlementList.filter(item => !ids.includes(item.id));
// this.checkedIds = [];
// this.onClearInvalidId();
// }
// })
}
}

37
pages/order/detail/components/Operation.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-15 17:46:10
* @LastEditors: ch
* @LastEditTime: 2022-04-22 22:23:35
* @LastEditTime: 2022-05-07 19:08:54
* @Description: file content
-->
<template>
@ -93,19 +93,36 @@ export default {
* 确认收货
*/
async receive(){
this.$msb.confirm({
uni.showModal({
content : '确认已经收到货了吗？',
confirm : async ()=>{
const {error} = await ApiPutOrderReceive({
orderId : this.$Route.query.id
});
if(error){
uni.$toast(error.message);
return false;
cancelColor : '#999',
confirmColor : '#3A83FB',
success: async ({confirm}) => {
if(confirm){
const {error} = await ApiPutOrderReceive({
orderId : this.$Route.query.id
});
if(error){
uni.$toast(error.message);
return false;
}
this.$Router.push('/orderSuccess');
}
this.$Router.push('/orderSuccess');
}
})
// this.$msb.confirm({
// content : '确认已经收到货了吗？',
// confirm : async ()=>{
// const {error} = await ApiPutOrderReceive({
// orderId : this.$Route.query.id
// });
// if(error){
// uni.$toast(error.message);
// return false;
// }
// this.$Router.push('/orderSuccess');
// }
// })
}
}

37
pages/order/list.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-22 10:58:24
* @LastEditors: ch
* @LastEditTime: 2022-04-30 14:56:38
* @LastEditTime: 2022-05-07 19:08:18
* @Description: file content
-->
<template>
@ -131,19 +131,36 @@ export default {
* 确认收货
*/
async receive(item){
this.$msb.confirm({
uni.showModal({
content : '确认已经收到货了吗？',
confirm : async ()=>{
const {error} = await ApiPutOrderReceive({
orderId : item.orderId
});
if(error){
uni.$toast(error.message);
return false;
cancelColor : '#999',
confirmColor : '#3A83FB',
success: async ({confirm}) => {
if(confirm){
const {error} = await ApiPutOrderReceive({
orderId : item.orderId
});
if(error){
uni.$toast(error.message);
return false;
}
this.$Router.push('/orderSuccess')
}
this.$Router.push('/orderSuccess')
}
})
// this.$msb.confirm({
// content : '确认已经收到货了吗？',
// confirm : async ()=>{
// const {error} = await ApiPutOrderReceive({
// orderId : item.orderId
// });
// if(error){
// uni.$toast(error.message);
// return false;
// }
// this.$Router.push('/orderSuccess')
// }
// })
}
}

8
pages/order/saleAfter/saleAfterApply.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-11 13:51:10
* @LastEditors: ch
* @LastEditTime: 2022-04-29 23:06:10
* @LastEditTime: 2022-05-07 19:15:03
* @Description: file content
-->
<template>
@ -110,6 +110,8 @@ export default {
},
async upload(val){
const file = val.file[0];
const urlArr = file.url.split('/');
const fileName = file.name || urlArr[urlArr.length - 1];
const oss = await this.getOssCon();
if(!oss) {
return false
@ -119,7 +121,7 @@ export default {
filePath : file.url,
url : oss.host,
formData : {
name : file.name,
name : fileName,
key : `${oss.dir}${'${filename}'}`,
policy : oss.policy,
OSSAccessKeyId : oss.accessId,
@ -128,7 +130,7 @@ export default {
},
success:(res)=>{
this.fileList.push({
url : `${oss.host}/${oss.dir}${file.name}`
url : `${oss.host}/${oss.dir}${fileName}`
})
}
})

32
pages/order/saleAfter/saleAfterDetail/components/AwaitExamine.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-14 11:56:57
* @LastEditors: ch
* @LastEditTime: 2022-04-14 16:26:04
* @LastEditTime: 2022-05-07 19:09:37
* @Description: file content
-->
<template>
@ -39,18 +39,34 @@ export default {
},
methods:{
cancelSaleAfter(){
this.$msb.confirm({
uni.showModal({
content : '你将撤销本次申请，撤销后，保障期内你可以再次申请售后服务',
cancelTxt : '我再想想',
confirm : async ()=> {
const {error, result} = await ApiPostCancelSaleAfter({refundId : this.data.refundId});
if(error){
uni.$u.toast(error.message);
return false;
cancelColor : '#999',
confirmColor : '#3A83FB',
success: async ({confirm}) => {
if(confirm){
const {error, result} = await ApiPostCancelSaleAfter({refundId : this.data.refundId});
if(error){
uni.$u.toast(error.message);
return false;
}
this.$emit('reload');
}
this.$emit('reload');
}
})
// this.$msb.confirm({
// content : '你将撤销本次申请，撤销后，保障期内你可以再次申请售后服务',
// cancelTxt : '我再想想',
// confirm : async ()=> {
// const {error, result} = await ApiPostCancelSaleAfter({refundId : this.data.refundId});
// if(error){
// uni.$u.toast(error.message);
// return false;
// }
// this.$emit('reload');
// }
// })
},
edit(){
this.$Router.push(`/saleAfterEdit?id=${this.data.refundId}`)

38
pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-14 13:44:30
* @LastEditors: ch
* @LastEditTime: 2022-05-07 16:56:16
* @LastEditTime: 2022-05-07 19:14:30
* @Description: file content
-->
<template>
@ -96,18 +96,34 @@ export default {
},
methods:{
async cancelSaleAfter(){
this.$msb.confirm({
uni.showModal({
content : '你将撤销本次申请，撤销后，保障期内你可以再次申请售后服务',
cancelTxt : '我再想想',
confirm : async ()=> {
const {error, result} = await ApiPostCancelSaleAfter({refundId : this.data.refundId});
if(error){
uni.$u.toast(error.message);
return false;
cancelColor : '#999',
confirmColor : '#3A83FB',
success: async ({confirm}) => {
if(confirm){
const {error, result} = await ApiPostCancelSaleAfter({refundId : this.data.refundId});
if(error){
uni.$u.toast(error.message);
return false;
}
this.$emit('reload');
}
this.$emit('reload');
}
})
// this.$msb.confirm({
// content : '你将撤销本次申请，撤销后，保障期内你可以再次申请售后服务',
// cancelTxt : '我再想想',
// confirm : async ()=> {
// const {error, result} = await ApiPostCancelSaleAfter({refundId : this.data.refundId});
// if(error){
// uni.$u.toast(error.message);
// return false;
// }
// this.$emit('reload');
// }
// })
},
confirmCompany(val){
this.params = {...this.params, ...val.value[0]}
@ -126,6 +142,8 @@ export default {
},
async upload(val){
const file = val.file[0];
const urlArr = file.url.split('/');
const fileName = file.name || urlArr[urlArr.length - 1];
const oss = await this.getOssCon();
if(!oss) {
return false
@ -135,7 +153,7 @@ export default {
filePath : file.url,
url : oss.host,
formData : {
name : file.name,
name : fileName,
key : `${oss.dir}${'${filename}'}`,
policy : oss.policy,
OSSAccessKeyId : oss.accessId,
@ -144,7 +162,7 @@ export default {
},
success:(res)=>{
this.fileList.push({
url : `${oss.host}/${oss.dir}${file.name}`
url : `${oss.host}/${oss.dir}${fileName}`
})
}
})

3
pages/order/saleAfter/saleAfterList.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-22 10:58:24
* @LastEditors: ch
* @LastEditTime: 2022-04-30 15:41:49
* @LastEditTime: 2022-05-07 18:44:44
* @Description: file content
-->
<template>
@ -83,7 +83,6 @@ export default {
<style lang="scss">
page {
background: $color-grey1;
overflow: hidden;
}
</style>
<style lang="scss" scoped>

4
pages/order/submit.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-20 14:14:53
* @LastEditors: ch
* @LastEditTime: 2022-05-07 17:49:18
* @LastEditTime: 2022-05-07 19:23:39
* @Description: file content
-->
<template>
@ -70,6 +70,7 @@
<script>
import UiCell from '@/components/UiCell';
import {ApiPostSubmitOrder, ApiGetBeforeOrder, ApiGetBeforeCartOrder} from '@/common/api/order';
import {ApiGetAddress } from '@/common/api/base';
import {Wxpay} from '@/common/utils';
import UiButton from '@/components/UiButton.vue';
import UiWhiteBox from '../../components/UiWhiteBox.vue';
@ -106,6 +107,7 @@ export default {
return false;
}
this.address = result.find(i => i.isDefault) || {};
console.log(this.address);
this.$store.commit('SET_ADDRESS', result);
},
/**

2
unpackage/dist/build/h5/index.html vendored
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.9de50bd9.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.bb40f6d1.js></script></body></html>

2
unpackage/dist/build/h5/static/js/index.9de50bd9.js → unpackage/dist/build/h5/static/js/index.bb40f6d1.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-account-address-edit.3124dd91.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-account-address-edit.dc6e68c4.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-account-setting-index.7a60bd76.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-account-setting-index.f0fb3ee3.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-cart-cart~pages-cart-tabBarCart.399bd679.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-cart-cart~pages-cart-tabBarCart.c8a9a3dd.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-cart-cart~pages-cart-tabBarCart~pages-goods-list-index~pages-index-index~pages-order-payResult.bae82e9f.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-cart-cart~pages-cart-tabBarCart~pages-goods-list-index~pages-index-index~pages-order-payResult.df41c94b.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-detail-index.3b56b85a.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-detail-index.bd18ffdb.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-list.3a99d720.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-list.b98e31a6.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-saleAfter-saleAfterApply.083419ba.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-saleAfter-saleAfterApply.f0a17180.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-saleAfter-saleAfterDetail-index.41332831.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-saleAfter-saleAfterDetail-index.5ee5ff57.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-saleAfter-saleAfterList.1a140c83.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-saleAfter-saleAfterList.d3511664.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-submit.5d5c7af3.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/h5/static/js/pages-order-submit.61024967.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save