Skip to content

S
shop_mobile_uni
Commit cad9ebad authored by 王建威's avatar 王建威
Browse files
Options

merge

parents 42ffe3c6 4337249d
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
manifest.json
View file @ cad9ebad
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "shop_mobile_uni", "name": "shop_mobile_uni",
"appid": "__UNI__F904656", "appid": "__UNI__F904656",
"description": "", "description": "",
"versionName": "1.0.28", "versionName": "1.0.29",
"versionCode": "100", "versionCode": "100",
"transformPx": false, "transformPx": false,
"app-plus": { "app-plus": {
...@@ -51,7 +51,11 @@ ...@@ -51,7 +51,11 @@
"mode": "history", "mode": "history",
"base": "/uni" "base": "/uni"
}, },
<<<<<<< HEAD
"publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/prod/1.0.28/", "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/prod/1.0.28/",
=======
"publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/prod/1.0.29/",
>>>>>>> 4337249d9c384579ecab61ff2298afbd363db5ee
"optimization": { "optimization": {
"treeShaking": { "treeShaking": {
"enable": true "enable": true
......
pages/search/search.vue
View file @ cad9ebad
...@@ -201,8 +201,10 @@ ...@@ -201,8 +201,10 @@
} }
this.goods_list = this.goods_list.concat(data.data || []); this.goods_list = this.goods_list.concat(data.data || []);
this.goods_list.map((item, key) => { this.goods_list.map((item, key) => {
if(item._source.is_pro === 1 && new Date(item._source.end_time).getTime() < new Date().getTime()) let end_time = item._source.end_time ? item._source.end_time.replace(/-/g, '/') : '';
item._source.is_pro = 0; if(item._source.is_pro === 1 && new Date(end_time).getTime() < new Date().getTime()){
item._source.is_pro = 0;
}
}); });
this.isLogin = data.login_flg === 1; this.isLogin = data.login_flg === 1;
const {total, page_size, current} = data.page; const {total, page_size, current} = data.page;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment