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 2 years ago
parent d84cff0873 a11c1f159d
commit de64c4d882
16 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File

4
components/UiGoodsGroup.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-04-07 17:22:44 * @Date: 2022-04-07 17:22:44
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-30 15:51:52 * @LastEditTime: 2022-04-30 16:52:08
* @Description: file content * @Description: file content
--> -->
@ -37,7 +37,7 @@
<view class="goods-item" v-for="item in goodsRightData" :key="item.id" <view class="goods-item" v-for="item in goodsRightData" :key="item.id"
@click="$Router.push(`/goodsDetail?id=${item.id}`)"> @click="$Router.push(`/goodsDetail?id=${item.id}`)">
<image class="goods-item--img" :src="item.mainPicture" mode="widthFix"></image> <image class="goods-item--img" :src="item.mainPicture" mode="widthFix"></image>
<view class="goods-item--title" :class="item.tagList.length && 'goods-item--title__indent'"> <view class="goods-item--title" :class="item.tagList && item.tagList.length && 'goods-item--title__indent'">
<image class="goods-item--tag" v-for="i in item.tagList" :key="i.code" src="@/static/goods/tag2.png"/> <image class="goods-item--tag" v-for="i in item.tagList" :key="i.code" src="@/static/goods/tag2.png"/>
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>

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)')) <!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.bf1ab369.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.b44f75e9.js></script></body></html>

2
h5/static/js/index.bf1ab369.js → h5/static/js/index.b44f75e9.js
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-account-address-edit.3124dd91.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~pages-order-payResult.78d3b3d7.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~pages-order-payResult.af6a8d59.js
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-goods-list-index.8aa69340.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-goods-list-index.971b3b9c.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-goods-search.c5c95833.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-goods-search.fadd13e5.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-saleAfter-saleAfterList.6f6a48ef.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-saleAfter-saleAfterList.74d17363.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 * @Author: ch
* @Date: 2022-03-22 14:12:18 * @Date: 2022-03-22 14:12:18
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-29 22:57:29 * @LastEditTime: 2022-04-30 17:03:45
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -68,14 +68,9 @@ export default {
$toast('请填写收货人姓名'); $toast('请填写收货人姓名');
return false; return false;
} }
if(this.oldPhone === this.address.phone){ if(this.address.phone != this.oldPhone && !IsPhone(this.address.phone)){
// 如果手机号没有变化需要把参数里的值删掉，以免编辑成加密数据 $toast('请填写正确的手机号');
delete this.address.phone; return false;
}else{
if(!this.address.phone || !IsPhone(this.address.phone)){
$toast('请填写正确的手机号');
return false;
}
} }
if(!this.city.length){ if(!this.city.length){

Write Preview
Loading…
Cancel
Save