Merge branch 'dev1.0.0' into develop

msb_beta
ch 3 years ago
commit d00101a464

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-04-21 09:54:15 * @Date: 2022-04-21 09:54:15
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-22 19:43:05 * @LastEditTime: 2022-05-05 11:46:17
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -55,8 +55,8 @@ export default {
if(this.float){ if(this.float){
if(!moneyArr[1]){ if(!moneyArr[1]){
moneyArr[1] = '00'; moneyArr[1] = '00';
}else if(moneyArr[1] < 10){ }else if(moneyArr[1].length < 1){
moneyArr[1] = `0${moneyArr[1]}`; moneyArr[1] = `${moneyArr[1]}0`;
} }
} }
return moneyArr; return moneyArr;

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-03-21 10:31:54 * @Date: 2022-03-21 10:31:54
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-30 15:50:35 * @LastEditTime: 2022-05-05 13:58:10
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -12,7 +12,7 @@
<u--input slot="custom" class="search--input" suffixIconStyle="font-size:48rpx;color:#ccc" <u--input slot="custom" class="search--input" suffixIconStyle="font-size:48rpx;color:#ccc"
suffixIcon="search" placeholderClass="search--input__placeholder" clearable suffixIcon="search" placeholderClass="search--input__placeholder" clearable
placeholder="请输入您想要搜索的商品名称" :value="$Route.query.search" placeholder="请输入您想要搜索的商品名称" :value="$Route.query.search"
@focus="$Router.push('/search')"/> @focus="goSearch"/>
</UiPageHeader> </UiPageHeader>
<!-- 排序标签 --> <!-- 排序标签 -->
<Sort @change="sortChange"></Sort> <Sort @change="sortChange"></Sort>
@ -115,6 +115,13 @@ export default {
this.params.pageIndex++; this.params.pageIndex++;
this.getGoodsList(); this.getGoodsList();
},
goSearch(){
if(this.$Route.query.search){
this.$Router.replace('/search')
}else{
this.$Router.push('/search')
}
} }
} }
}; };

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-04-28 15:01:41 * @Date: 2022-04-28 15:01:41
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-05-05 11:02:48 * @LastEditTime: 2022-05-05 11:34:39
* @Description: file content * @Description: file content
--> -->
@ -19,7 +19,7 @@
<view class="desc">您的包裹整装待发</view> <view class="desc">您的包裹整装待发</view>
<view class="btns"> <view class="btns">
<UiButton class="btn" type="primaryLine" @click="$Router.replaceAll('/')"></UiButton> <UiButton class="btn" type="primaryLine" @click="$Router.replaceAll('/')"></UiButton>
<UiButton class="btn" type="solid" @click="$Router.replace(`/orderDetail?id=${$Route.query.ordId}`)"></UiButton> <UiButton class="btn" type="solid" @click="$Router.replace(`/orderDetail?id=${$Route.query.orderId}`)"></UiButton>
</view> </view>
<view class="recommend-title">为您推荐</view> <view class="recommend-title">为您推荐</view>
<BsChoiceGoods></BsChoiceGoods> <BsChoiceGoods></BsChoiceGoods>

@ -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.5496e6cc.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.a36182e5.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

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