diff --git a/common/config.js b/common/config.js index a2dd77d..68c7a9a 100644 --- a/common/config.js +++ b/common/config.js @@ -6,8 +6,8 @@ * loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 */ module.exports = { - // baseUrl: 'http://192.168.2.113:7201', - baseUrl: 'https://supervise.yxtsoft.com/lpkapi', + baseUrl: 'http://192.168.2.113:7201', + // baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // baseUrl: 'http://jianguan.yyundong.com/api', tokenName: "Authorization", // 请求头中token的名字，与服务器端对应 loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码 diff --git a/pages.json b/pages.json index ddaa69f..3ceb46d 100644 --- a/pages.json +++ b/pages.json @@ -35,8 +35,7 @@ { "path": "pages/card/card_bind", "style": { - "navigationBarTitleText": "绑定云菜窖卡", - "enablePullDownRefresh": false + "navigationStyle": "custom" } }, @@ -44,8 +43,7 @@ { "path": "pages/card/card_bind2", "style": { - "navigationBarTitleText": "绑定云菜窖卡", - "enablePullDownRefresh": false + "navigationStyle": "custom" } }, { "path": "pages/index/BindPhone", @@ -83,23 +81,23 @@ { "path": "pages/good/goodsDetail", "style": { - "navigationBarTitleText": "商品详情", + "navigationBarTitleText": "产品详情", "enablePullDownRefresh": false } }, { "path": "pages/SelectAddressActivity", "style": { - "navigationBarTitleText": "选择提货点", + "navigationBarTitleText": "提货点列表", "enablePullDownRefresh": false } } ], "globalStyle": { - "navigationBarTextStyle": "black", + "navigationBarTextStyle": "white", "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" + "navigationBarBackgroundColor": "#FE9039", + "backgroundColor": "#FE9039" }, "tabBar": { "color": "#7A7E83", @@ -109,13 +107,13 @@ "list": [{ "pagePath": "pages/card/card", "text": "礼包", - "iconPath": "static/ze_bag_1.png", - "selectedIconPath": "static/ze_bag2.png" + "iconPath": "static/bomicon/bom_notPack.png", + "selectedIconPath": "static/bomicon/bom_pack.png" }, { "pagePath": "pages/record/recordList", "text": "预约记录", - "iconPath": "static/ze_underway1.png", - "selectedIconPath": "static/ze_underway2.png" + "iconPath": "static/bomicon/bom_notRecord.png", + "selectedIconPath": "static/bomicon/bom_record.png" }] }, "uniIdRouter": {} diff --git a/pages/SelectAddressActivity.vue b/pages/SelectAddressActivity.vue index 953e3df..abec9fe 100644 --- a/pages/SelectAddressActivity.vue +++ b/pages/SelectAddressActivity.vue @@ -1,6 +1,6 @@ @@ -164,14 +193,18 @@ } .btn { - display: flex; - flex-direction: row; - padding: 10px; + margin-top: 10px; + border: 1px solid #FEA561; + border-radius: 20px; + display: flex;flex-direction: row; align-items: center; + justify-content: center; + padding: 5px 10px; + margin-bottom: 10px; } .search-body { - background-color: #ffffff; + background-color: #FE9039; border-bottom-right-radius: 10px; border-bottom-left-radius: 10px; } @@ -204,7 +237,7 @@ top: 0; left: 0; right: 0; - background: white; + background: #FE9039; } } } diff --git a/pages/card/card.vue b/pages/card/card.vue index 0b4a1bd..eb3b00b 100644 --- a/pages/card/card.vue +++ b/pages/card/card.vue @@ -8,7 +8,7 @@ - + 绑定新卡 @@ -18,7 +18,7 @@ - + - - @@ -50,7 +50,8 @@ - 预约提货 @@ -134,10 +135,17 @@ } }, - booking(sid) { - uni.navigateTo({ - url: '/pages/card/card_booking?sid=' + sid - }) + booking(item) { + + if(!item.notRese){ + this.shortToast("该卡商品已全部预约。") + return + }else{ + uni.navigateTo({ + url: '/pages/card/card_booking?sid=' + item.sid + }) + } + } } } @@ -146,15 +154,17 @@ \ No newline at end of file diff --git a/pages/card/card_bind2.vue b/pages/card/card_bind2.vue index 38c5bed..930c419 100644 --- a/pages/card/card_bind2.vue +++ b/pages/card/card_bind2.vue @@ -2,10 +2,19 @@ - - - - + + + + + + + + + + + + + + + + + + + 绑定云菜窖卡 + + + 提货编码 + + + + + + 提货密码 + + + + + + 绑定 + diff --git a/pages/card/card_record.vue b/pages/card/card_record.vue index ec631b5..488d30d 100644 --- a/pages/card/card_record.vue +++ b/pages/card/card_record.vue @@ -98,10 +98,4 @@ background: linear-gradient(89.8deg, rgba(218, 51, 33, 1) -3.76%, rgba(237, 113, 53, 0) 300.05%); } - .bottom { - /* 加载背景图 */ - background-image: url(../../static/card_bg1.png); - /* 让背景图基于容器大小伸缩 */ - background-size: cover; - } \ No newline at end of file diff --git a/pages/good/goodsDetail.vue b/pages/good/goodsDetail.vue index e75dd19..721851c 100644 --- a/pages/good/goodsDetail.vue +++ b/pages/good/goodsDetail.vue @@ -2,8 +2,8 @@ - - + + + + + {{data.name}} + + + 规    格 + {{data.remarks}} + + + + + + 商品详情 + + + + + + + + + + @@ -49,7 +75,8 @@ picUrl: '', name: '', price: '', - remarks: '' + remarks: '', + appContent: "" } } }, @@ -57,12 +84,47 @@ this.page.sid = options.sid this.request() }, + filters: { + /** + * 处理富文本里的图片宽度自适应 + * 1.去掉img标签里的style、width、height属性 + * 2.img标签添加style属性：max-width:100%;height:auto + * 3.修改所有style里的width属性为max-width:100% + * 4.去掉
标签 + * @param html + * @returns {void|string|*} + */ + formatRichText(html) { + //控制小程序中图片大小 + if (html) { + let newContent = html.replace(/]*>/gi, function(match, capture) { + match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, ''); + match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, ''); + match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, ''); + return match; + }); + newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) { + match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi, + 'max-width:100%;'); + return match; + }); + newContent = newContent.replace(/]*\/>/gi, ''); + newContent = newContent.replace(/\ { console.log(resp); _this.data = resp + + _this.$nextTick(() => { _this.$refs.pageView.setLoadState(2) }) diff --git a/pages/record/recordList.vue b/pages/record/recordList.vue index 7c0ad95..87d1c3f 100644 --- a/pages/record/recordList.vue +++ b/pages/record/recordList.vue @@ -1,45 +1,93 @@ \ No newline at end of file diff --git a/static/OIP-C.jpg b/static/OIP-C.jpg deleted file mode 100644 index 36b49e9..0000000 Binary files a/static/OIP-C.jpg and /dev/null differ diff --git a/static/address_confirm.png b/static/address_confirm.png deleted file mode 100644 index d4dd2f7..0000000 Binary files a/static/address_confirm.png and /dev/null differ diff --git a/static/address_location.png b/static/address_location.png deleted file mode 100644 index f2d3f3b..0000000 Binary files a/static/address_location.png and /dev/null differ diff --git a/static/address_name.png b/static/address_name.png deleted file mode 100644 index 313fff2..0000000 Binary files a/static/address_name.png and /dev/null differ diff --git a/static/address_phone.png b/static/address_phone.png deleted file mode 100644 index 46513aa..0000000 Binary files a/static/address_phone.png and /dev/null differ diff --git a/static/address_phone2.png b/static/address_phone2.png deleted file mode 100644 index 028314c..0000000 Binary files a/static/address_phone2.png and /dev/null differ diff --git a/static/binding.png b/static/binding.png deleted file mode 100644 index c2d6062..0000000 Binary files a/static/binding.png and /dev/null differ diff --git a/static/bing_bg.png b/static/bing_bg.png deleted file mode 100644 index 7269ee8..0000000 Binary files a/static/bing_bg.png and /dev/null differ diff --git a/static/bomicon/bom_notPack.png b/static/bomicon/bom_notPack.png index 2206eb0..28b627d 100644 Binary files a/static/bomicon/bom_notPack.png and b/static/bomicon/bom_notPack.png differ diff --git a/static/bomicon/bom_notRecord.png b/static/bomicon/bom_notRecord.png index f4147d8..6d63e9b 100644 Binary files a/static/bomicon/bom_notRecord.png and b/static/bomicon/bom_notRecord.png differ diff --git a/static/bomicon/bom_pack.png b/static/bomicon/bom_pack.png index 7bc1a99..bf284e9 100644 Binary files a/static/bomicon/bom_pack.png and b/static/bomicon/bom_pack.png differ diff --git a/static/bomicon/bom_record.png b/static/bomicon/bom_record.png index f8a98fd..f70ad64 100644 Binary files a/static/bomicon/bom_record.png and b/static/bomicon/bom_record.png differ diff --git a/static/btn_bj.png b/static/btn_bj.png deleted file mode 100644 index 01275fd..0000000 Binary files a/static/btn_bj.png and /dev/null differ diff --git a/static/card_bg1.png b/static/card_bg1.png deleted file mode 100644 index 218114f..0000000 Binary files a/static/card_bg1.png and /dev/null differ diff --git a/static/card_item.png b/static/card_item.png deleted file mode 100644 index c56d4cc..0000000 Binary files a/static/card_item.png and /dev/null differ diff --git a/static/card_item2.png b/static/card_item2.png deleted file mode 100644 index b8e6e89..0000000 Binary files a/static/card_item2.png and /dev/null differ diff --git a/static/card_line.png b/static/card_line.png deleted file mode 100644 index eb9d66b..0000000 Binary files a/static/card_line.png and /dev/null differ diff --git a/static/goods_price_bg.png b/static/goods_price_bg.png deleted file mode 100644 index 17dc172..0000000 Binary files a/static/goods_price_bg.png and /dev/null differ diff --git a/static/hmoe_bj.png b/static/hmoe_bj.png deleted file mode 100644 index b14b659..0000000 Binary files a/static/hmoe_bj.png and /dev/null differ diff --git a/static/pack.png b/static/pack.png deleted file mode 100644 index 5b29a2d..0000000 Binary files a/static/pack.png and /dev/null differ diff --git a/static/pack2.png b/static/pack2.png deleted file mode 100644 index bfc4b91..0000000 Binary files a/static/pack2.png and /dev/null differ diff --git a/static/ze_bag2.png b/static/ze_bag2.png deleted file mode 100644 index f5a047a..0000000 Binary files a/static/ze_bag2.png and /dev/null differ diff --git a/static/ze_bag_1.png b/static/ze_bag_1.png deleted file mode 100644 index 8fce1b4..0000000 Binary files a/static/ze_bag_1.png and /dev/null differ diff --git a/static/ze_underway1.png b/static/ze_underway1.png deleted file mode 100644 index 6f29369..0000000 Binary files a/static/ze_underway1.png and /dev/null differ diff --git a/static/ze_underway2.png b/static/ze_underway2.png deleted file mode 100644 index 656b5d6..0000000 Binary files a/static/ze_underway2.png and /dev/null differ