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

Merge branch 'dev1.0.0' into develop

Browse Source
msb_beta
ch 4 years ago
parent 429c4c983f 3e8bbdcdd2
commit 9b82c1d09c
45 changed files with 123 additions and 96 deletions
Show Stats Download Patch File Download Diff File

7
common/utils/requset.js
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-17 17:42:32
* @LastEditors: ch
* @LastEditTime: 2022-04-21 17:20:17
* @LastEditTime: 2022-04-21 20:43:35
* @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
*/
@ -11,8 +11,8 @@ import $store from '@/common/store';
const ENV = 'test';
const BASE_URL = {
// 'test' : 'http://k8s-horse-gateway.mashibing.cn',
'test' : '',
'test' : 'http://k8s-horse-gateway.mashibing.cn',
// 'test' : '',
'release' : '',
'prod' : ''
};
@ -119,7 +119,6 @@ MsbRequestTk.use('request', (option) => {
return isRepeatVerify;
}
}
console.log(option);
return option;
}
})

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.6597793b.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.29641dd5.js></script></body></html>

BIN
h5/static/index/logo1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.1 KiB

BIN
h5/static/index/search.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 826 B

After

Width:  |  Height:  |  Size: 696 B

BIN
h5/static/index/search1.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 826 B

BIN
h5/static/index/time_bg.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 290 B

2
h5/static/js/index.6597793b.js → h5/static/js/index.29641dd5.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.0b488e7e.js → h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.4df64c2a.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-account-address-edit.40908420.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-account-address-edit.86f536c3.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-account-address-list.57c9adff.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-account-address-list.f9dad5c6.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.1c7a2f3a.js → h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.e431ed9e.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-index.07779e99.js → h5/static/js/pages-account-index.1ea3bcde.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-setting-setName.68ff3dba.js → h5/static/js/pages-account-setting-setName.2af906f3.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-cart-cart.280fd0eb.js
Unescape View File

@ -1 +0,0 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-cart-cart"],{"0ba2":function(n,t,a){"use strict";var e=a("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=e(a("734f")),c={components:{PageCtx:r.default},onShow:function(){this.$refs.page&&this.$refs.page.open()},mounted:function(){this.$refs.page.open()}};t.default=c},"0ddb":function(n,t,a){var e=a("24fb");t=e(!1),t.push([n.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 透明度 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 间距 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */uni-page-body[data-v-529a9cda]{background:#f5f5f5;padding-bottom:%?120?%}body.?%PAGE?%[data-v-529a9cda]{background:#f5f5f5}',""]),n.exports=t},"4a3ce":function(n,t,a){"use strict";var e=a("c267"),r=a.n(e);r.a},b408:function(n,t,a){"use strict";var e;a.d(t,"b",(function(){return r})),a.d(t,"c",(function(){return c})),a.d(t,"a",(function(){return e}));var r=function(){var n=this,t=n.$createElement,a=n._self._c||t;return a("PageCtx",{ref:"page",staticClass:"page",attrs:{type:"inner"}})},c=[]},c267:function(n,t,a){var e=a("0ddb");"string"===typeof e&&(e=[[n.i,e,""]]),e.locals&&(n.exports=e.locals);var r=a("4f06").default;r("1edb3d4a",e,!0,{sourceMap:!1,shadowMode:!1})},e81f:function(n,t,a){"use strict";a.r(t);var e=a("0ba2"),r=a.n(e);for(var c in e)"default"!==c&&function(n){a.d(t,n,(function(){return e[n]}))}(c);t["default"]=r.a},f662:function(n,t,a){"use strict";a.r(t);var e=a("b408"),r=a("e81f");for(var c in r)"default"!==c&&function(n){a.d(t,n,(function(){return r[n]}))}(c);a("4a3ce");var o,u=a("f0c5"),s=Object(u["a"])(r["default"],e["b"],e["c"],!1,null,"529a9cda",null,!1,e["a"],o);t["default"]=s.exports}}]);

1
h5/static/js/pages-cart-cart.9828acc3.js
Unescape View File

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-cart-cart"],{"01b6":function(n,t,a){var e=a("b71b");"string"===typeof e&&(e=[[n.i,e,""]]),e.locals&&(n.exports=e.locals);var r=a("4f06").default;r("63575d96",e,!0,{sourceMap:!1,shadowMode:!1})},"0ba2":function(n,t,a){"use strict";var e=a("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=e(a("734f")),f={components:{PageCtx:r.default},onShow:function(){this.$refs.page&&this.$refs.page.open()},mounted:function(){this.$refs.page.open()}};t.default=f},4772:function(n,t,a){"use strict";var e;a.d(t,"b",(function(){return r})),a.d(t,"c",(function(){return f})),a.d(t,"a",(function(){return e}));var r=function(){var n=this,t=n.$createElement,a=n._self._c||t;return a("PageCtx",{ref:"page",staticClass:"page",attrs:{type:"inner"}})},f=[]},b71b:function(n,t,a){var e=a("24fb");t=e(!1),t.push([n.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 透明度 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 间距 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */uni-page-body[data-v-553a5063]{background:#f5f5f5;padding-bottom:%?120?%}body.?%PAGE?%[data-v-553a5063]{background:#f5f5f5}',""]),n.exports=t},e81f:function(n,t,a){"use strict";a.r(t);var e=a("0ba2"),r=a.n(e);for(var f in e)"default"!==f&&function(n){a.d(t,n,(function(){return e[n]}))}(f);t["default"]=r.a},f662:function(n,t,a){"use strict";a.r(t);var e=a("4772"),r=a("e81f");for(var f in r)"default"!==f&&function(n){a.d(t,n,(function(){return r[n]}))}(f);a("faf9");var o,u=a("f0c5"),s=Object(u["a"])(r["default"],e["b"],e["c"],!1,null,"553a5063",null,!1,e["a"],o);t["default"]=s.exports},faf9:function(n,t,a){"use strict";var e=a("01b6"),r=a.n(e);r.a}}]);

1
h5/static/js/pages-cart-cart~pages-cart-tabBarCart.2ff6fc26.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-cart-cart~pages-cart-tabBarCart.39855588.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-cart-cart~pages-cart-tabBarCart~pages-goods-list-index~pages-index-index.1331e5bb.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-cart-cart~pages-cart-tabBarCart~pages-goods-list-index~pages-index-index.3a66e3c1.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-cart-tabBarCart.41dde9fd.js
Unescape View File

@ -1 +0,0 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-cart-tabBarCart"],{1266:function(n,t,a){"use strict";a.r(t);var e=a("947c"),r=a("fb42");for(var o in r)"default"!==o&&function(n){a.d(t,n,(function(){return r[n]}))}(o);a("bbf8");var u,f=a("f0c5"),s=Object(f["a"])(r["default"],e["b"],e["c"],!1,null,"4b253d30",null,!1,e["a"],u);t["default"]=s.exports},"6a2b":function(n,t,a){var e=a("f7d1");"string"===typeof e&&(e=[[n.i,e,""]]),e.locals&&(n.exports=e.locals);var r=a("4f06").default;r("2360e6ce",e,!0,{sourceMap:!1,shadowMode:!1})},"947c":function(n,t,a){"use strict";var e;a.d(t,"b",(function(){return r})),a.d(t,"c",(function(){return o})),a.d(t,"a",(function(){return e}));var r=function(){var n=this,t=n.$createElement,a=n._self._c||t;return a("PageCtx",{ref:"page",staticClass:"page",attrs:{type:"tabBar"}})},o=[]},bbf8:function(n,t,a){"use strict";var e=a("6a2b"),r=a.n(e);r.a},e625:function(n,t,a){"use strict";var e=a("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=e(a("734f")),o={components:{PageCtx:r.default},onShow:function(){this.$refs.page&&this.$refs.page.open()},mounted:function(){this.$refs.page.open()}};t.default=o},f7d1:function(n,t,a){var e=a("24fb");t=e(!1),t.push([n.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 透明度 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 间距 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */uni-page-body[data-v-4b253d30]{background:#f8f8f8;padding-bottom:%?240?%}body.?%PAGE?%[data-v-4b253d30]{background:#f8f8f8}',""]),n.exports=t},fb42:function(n,t,a){"use strict";a.r(t);var e=a("e625"),r=a.n(e);for(var o in e)"default"!==o&&function(n){a.d(t,n,(function(){return e[n]}))}(o);t["default"]=r.a}}]);

1
h5/static/js/pages-cart-tabBarCart.e08f89ca.js
Unescape View File

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-cart-tabBarCart"],{1266:function(n,t,e){"use strict";e.r(t);var a=e("93ad"),r=e("fb42");for(var f in r)"default"!==f&&function(n){e.d(t,n,(function(){return r[n]}))}(f);e("9dc8");var o,u=e("f0c5"),s=Object(u["a"])(r["default"],a["b"],a["c"],!1,null,"30eeb2f8",null,!1,a["a"],o);t["default"]=s.exports},"93ad":function(n,t,e){"use strict";var a;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return f})),e.d(t,"a",(function(){return a}));var r=function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("PageCtx",{ref:"page",staticClass:"page",attrs:{type:"tabBar"}})},f=[]},"9dc8":function(n,t,e){"use strict";var a=e("f1d5"),r=e.n(a);r.a},e625:function(n,t,e){"use strict";var a=e("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=a(e("734f")),f={components:{PageCtx:r.default},onShow:function(){this.$refs.page&&this.$refs.page.open()},mounted:function(){this.$refs.page.open()}};t.default=f},ea7e:function(n,t,e){var a=e("24fb");t=a(!1),t.push([n.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 透明度 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 间距 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */uni-page-body[data-v-30eeb2f8]{background:#f8f8f8;padding-bottom:%?240?%}body.?%PAGE?%[data-v-30eeb2f8]{background:#f8f8f8}',""]),n.exports=t},f1d5:function(n,t,e){var a=e("ea7e");"string"===typeof a&&(a=[[n.i,a,""]]),a.locals&&(n.exports=a.locals);var r=e("4f06").default;r("c8eb01e4",a,!0,{sourceMap:!1,shadowMode:!1})},fb42:function(n,t,e){"use strict";e.r(t);var a=e("e625"),r=e.n(a);for(var f in a)"default"!==f&&function(n){e.d(t,n,(function(){return a[n]}))}(f);t["default"]=r.a}}]);

2
h5/static/js/pages-goods-detail-index.7306ed2b.js → h5/static/js/pages-goods-detail-index.7d341c56.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-index-index.35cdd1e7.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-index-index.dfb3a4c3.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-login.2362d8bd.js → h5/static/js/pages-login.5a1c273e.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-detail-index.037fc1b4.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-detail-index.40e0d716.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-detail-index~pages-order-logisitcsInfo~pages-order-saleAfter-saleAfterDetail-index~pages~f184e353.4a182b69.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-detail-index~pages-order-logisitcsInfo~pages-order-saleAfter-saleAfterDetail-index~pages~f184e353.713b25f1.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-list.9b677206.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-list.ece48c64.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-logisitcsInfo.67b20da0.js → h5/static/js/pages-order-logisitcsInfo.1c0a6f4a.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterApply.c9285fa8.js → h5/static/js/pages-order-saleAfter-saleAfterApply.d26c3072.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterEdit.192c8848.js → h5/static/js/pages-order-saleAfter-saleAfterEdit.3ecb6312.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterSelect.029396d7.js → h5/static/js/pages-order-saleAfter-saleAfterSelect.5d680a99.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-submit.cfb950bc.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-submit.f5254cbb.js
View File

File diff suppressed because one or more lines are too long

13
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-20 19:23:30
* @LastEditTime: 2022-04-21 21:12:19
* @Description: file content
-->
<template>
@ -95,18 +95,15 @@ export default {
this.$Router.back();
},
async delAddress(){
uni.showModal({
title: '友情提示',
content: '您确定要删除该地址吗？',
showCancel: true,
success:async ()=> {
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();
this.$Router.back();\
}
})
}

90
pages/account/address/list.vue
Unescape View File

@ -2,29 +2,28 @@
* @Author: ch
* @Date: 2022-03-22 13:54:15
* @LastEditors: ch
* @LastEditTime: 2022-04-21 14:18:12
* @LastEditTime: 2022-04-21 21:01:49
* @Description: file content
-->
<template>
<view class="container">
<view class="address">
<u-loadmore v-if="isLoading" status="loading" />
<BsEmpty tips="暂无收货地址呢~" v-if="!isLoading && !addresList.length"></BsEmpty>
<view class="addressItem" v-for="(item, index) in addresList" :key="item.id"
:class="{'addressItem__last' : index === addresList.length - 1,'addressItem__default':item.isDefault}">
<radio v-if="query.source" :checked="item.id === selectedId" @click="changeAds(item)"/>
<view>
<view class="addressItem--city">{{item.province}}{{item.city}}{{item.area}}</view>
<view class="addressItem--detail">{{item.detailAddress}}</view>
<view>
<text class="addressItem--name">{{item.name}}</text>
<u-loadmore v-if="isLoading" status="loading" />
<UiWhiteBox class="address-item" v-for="(item) in addresList" :key="item.id"
:class="{'address-item__default':item.isDefault}">
<radio class="address-item--radio" v-if="query.source == 'submitOrder'" color="#FF875B"
:checked="item.id == selectedId" @click="changeAds(item)"/>
<view class="address-item--con">
<view class="address-item--city">{{item.province}}{{item.city}}{{item.area}}</view>
<view class="address-item--detail">{{item.detailAddress}}</view>
<view class="address-item--info">
<text class="address-item--name">{{item.name}}</text>
<text>{{item.phone}}</text>
</view>
</view>
<image class="addressItem--edit" src="@/static/account/edit.png"
<image class="address-item--edit" src="@/static/account/edit.png"
@click="$Router.push(`/addressEdit?id=${item.id}`)" />
</view>
</view>
</UiWhiteBox>
<UiButton class="addAddress" type="solid" size="max"
@click="$Router.push(`/addressCreate?first=${!addresList.length}`)">新增地址</UiButton>
@ -35,27 +34,35 @@
import BsEmpty from "@/components/BsEmpty";
import UiButton from '../../../components/UiButton.vue';
import {ApiGetAddress} from '@/common/api/base';
import UiWhiteBox from '../../../components/UiWhiteBox.vue';
export default {
components: { BsEmpty, UiButton },
components: { BsEmpty, UiButton, UiWhiteBox },
data() {
const {query} = this.$Route;
return {
query:{
type : query.type,
// 选中地址ID
id : query.id,
// 来源，选择地址时触发全局事件时的标记 submitOrder 提交订单
source : query.source,
status : query.status
source : query.source
},
addresList : [],
isLoading : true
};
},
computed:{
selectedId (){
const defaultAddress = this.addresList.find(i => i.isDefault);
return Number(this.query.id) || defaultAddress.id;
selectedId :{
get(){
const queryId = this.query.id,
defaultAddress = this.addresList.find(i => i.isDefault);
return queryId || defaultAddress.id;
},
set(val){
// 改变地址后触发全局事件，把当前选中地址传入。不能使用VUEX实现，因为选择地址只针对当前订单的操作
uni.$emit('changeAddress',this.addresList.find(i => i.id == val) || {}, this.query.source);
}
}
},
onShow(options) {
@ -63,7 +70,7 @@ export default {
},
methods: {
async getAddressList(){
this.isLoading = true;
this.isLoading = true;
const {error, result} = await ApiGetAddress();
this.isLoading = false;
if(error){
@ -72,13 +79,17 @@ export default {
}
this.addresList = result;
this.$store.commit('SET_ADDRESS', result);
if(this.query.source === 'submitOrder'){
// 每次刷新列表都做一次提交订单页的选中地址更新
uni.$emit('changeAddress',this.addresList.find(i => i.id == this.selectedId) || {}, this.query.source);
}
},
/**
* 选择地址
*/
changeAds(item){
// 改变地址后触发全局事件，把当前选中地址传入。不能使用VUEX实现，因为选择地址只针对当前订单的操作
uni.$emit('changeAddress',item, this.query.source);
this.selectedId = item.id;
this.$Router.back();
}
},
@ -92,20 +103,35 @@ page{
.address{
background: $color-grey0;
}
.addressItem{
.address-item{
height: 188rpx;
margin-left: 40rpx;
padding-right: 40rpx;
border-bottom: 1px solid $color-grey2;
padding: 0 40rpx 0 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
font-size: $font-size-sm;
color: $color-grey4;
&--radio{
// width: 40rpx;
transform: scale(60%);
}
&--con{
flex: 1;
margin-left: 10rpx;
}
&--city{
font-size: $font-size-sm;
color: $color-grey4;
}
&--detail{
font-size: $font-size-base;
color: $color-grey6;
margin: 20rpx 0;
}
&--info text{
font-size: $font-size-sm;
color: $color-grey4;
}
&--name{
margin-right: 46rpx;
@ -114,9 +140,10 @@ page{
width: 26rpx;
height: 26rpx;
}
&__default .addressItem--city{
&__default .address-item--city{
display: flex;
align-items: center;
// max-width: 400rpx;
&::after{
display: block;
content: '默认';
@ -125,6 +152,7 @@ page{
border-radius: 4rpx;
padding: 4rpx 6rpx;
margin-left: 20rpx;
width: 62rpx;
}
}
&__last{

24
pages/index/components/Pick.vue
Unescape View File

@ -2,44 +2,46 @@
* @Author: ch
* @Date: 2022-03-23 10:29:07
* @LastEditors: ch
* @LastEditTime: 2022-04-21 16:23:22
* @LastEditTime: 2022-04-21 19:11:01
* @Description: file content
-->
<template>
<view class="pick">
<view class="max" @click="$Router.push(`/goodsDetail?id=${max.id}`)">
<view class="title">{{max.name}}</view>
<view class="desc">{{max.name}}</view>
<view class="title">{{max.title}}</view>
<view class="desc">{{max.subTitle}}</view>
<!-- <view class="tag"></view> -->
<!-- <view class="price">￥{{max.startingPrice}}</view> -->
<UiMoney class="price" :money="max.startingPrice" prefix></UiMoney>
<view class="img-box">
<image class="img" :src="max.mainPicture"/>
<image class="img" :src="max.recommendPicture"/>
</view>
</view>
<view class="min" @click="$Router.push(`/goodsDetail?id=${minOne.id}`)">
<view class="title">{{minOne.name}}</view>
<view class="title">{{minOne.title}}</view>
<view class="min--info-box">
<view class="min--info-box-right">
<view class="desc">{{minOne.name}}</view>
<!-- <view class="tag"></view> -->
<view class="desc">{{minOne.subTitle}}</view>
<view class="tag">
sss
</view>
<UiMoney class="price" :money="minOne.startingPrice" prefix></UiMoney>
</view>
<view class="img-box">
<image class="img" :src="minOne.mainPicture"/>
<image class="img" :src="minOne.recommendPicture"/>
</view>
</view>
</view>
<view class="min" @click="$Router.push(`/goodsDetail?id=${minTwo.id}`)">
<view class="title">{{minTwo.name}}</view>
<view class="title">{{minTwo.title}}</view>
<view class="min--info-box">
<view class="min--info-box-right">
<view class="desc">{{minTwo.name}}</view>
<view class="desc">{{minTwo.subTitle}}</view>
<view class="tag"></view>
<UiMoney class="price" :money="minTwo.startingPrice" prefix></UiMoney>
</view>
<view class="img-box">
<image class="img" :src="minTwo.mainPicture"/>
<image class="img" :src="minTwo.recommendPicture"/>
</view>
</view>
</view>

24
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-21 18:04:27
* @LastEditTime: 2022-04-21 18:49:52
* @Description: file content
-->
<template>
@ -20,21 +20,21 @@
</template>
<u-popup class="cancel" :show="cancelShow" @close="closeCancel" round="16rpx" closeable>
<view class="cancel--title">取消订单原因</view>
<radio-group class="cancel--cell" @change="cancelChange">
<UiCell title="我不想买了">
<radio slot="right-icon" value="1" class="cancel--radio" color="#FF875B"/>
<radio-group class="cancel--cell">
<UiCell title="我不想买了" @click="cancelChange(1)">
<radio slot="right-icon" :checked="cancelValue == 1" class="cancel--radio" color="#FF875B"/>
</UiCell>
<UiCell title="地址信息填写错误">
<radio slot="right-icon" value="2" class="cancel--radio" color="#FF875B"/>
<UiCell title="地址信息填写错误" @click="cancelChange(2)">
<radio slot="right-icon" :checked="cancelValue == 2" class="cancel--radio" color="#FF875B"/>
</UiCell>
<UiCell title="商品降价">
<radio slot="right-icon" value="3" class="cancel--radio" color="#FF875B"/>
<UiCell title="商品降价" @click="cancelChange(3)">
<radio slot="right-icon" :checked="cancelValue == 3" class="cancel--radio" color="#FF875B"/>
</UiCell>
<UiCell title="商品无货">
<radio slot="right-icon" value="4" class="cancel--radio" color="#FF875B"/>
<UiCell title="商品无货" @click="cancelChange(4)">
<radio slot="right-icon" :checked="cancelValue == 4" class="cancel--radio" color="#FF875B"/>
</UiCell>
<UiCell title="其他">
<radio slot="right-icon" value="5" class="cancel--radio" color="#FF875B"/>
<UiCell title="其他" @click="cancelChange(5)">
<radio slot="right-icon" :checked="cancelValue == 5" class="cancel--radio" color="#FF875B"/>
</UiCell>
</radio-group>
<view class="cancel--footer">

6
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-21 17:36:30
* @LastEditTime: 2022-04-21 18:30:09
* @Description: file content
-->
<template>
@ -51,7 +51,7 @@
v-if="item.orderStatus == 4" @click="receive(item)">确认收货</button>
</view>
</view>
<u-loadmore :status="loadingStatus" v-if="orderListData.length" />
<u-loadmore :status="loadingStatus" v-if="loadingStatus === 'loading'"/>
<BsPay :show.sync="payShow" :order="payOrder"></BsPay>
</view>
@ -111,7 +111,7 @@ export default {
return false;
}
// 标记是否为最后一页
if(!result.records.length){
if(result.records.length < this.pageSize){
this.loadingStatus = 'nomore';
}
this.orderListData = this.orderListData.concat(result.records);

9
pages/order/submit.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-20 14:14:53
* @LastEditors: ch
* @LastEditTime: 2022-04-21 11:27:13
* @LastEditTime: 2022-04-21 19:58:02
* @Description: file content
-->
<template>
@ -92,18 +92,18 @@ export default {
}
},
onLoad(){
this.getBeforeOrder();
// 从地址列表页改变了收货地址
uni.$on('changeAddress',(item, type)=>{
if(type == 'submitOrder'){
this.address = item;
this.getBeforeOrder(item.id);
}
});
// 默认选择设为默认的地址
this.address = this.$store.state.address.find(i => i.isDefault) || {};
},
onShow(){
this.getBeforeOrder();
},
methods:{
/**
* 获取预订单信息，将要提交的订单信息
@ -153,6 +153,7 @@ export default {
const {error, result} = await ApiPostSubmitOrder({
orderSource : 2,
recipientAddressId : this.address.id,
shoppingCartIds : query.ids ? query.ids.split(',') : [],
products : this.orderInfo.products.map(i => ({
productId : i.productId,
productSkuId : i.productSkuId,

Write Preview
Loading…
Cancel
Save