From c187bec574d63afbccb19ecc01c202a31795dd7e Mon Sep 17 00:00:00 2001 From: santaner Date: Thu, 4 Jan 2024 18:18:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9B=B8=E5=85=B3=E5=85=83?= =?UTF-8?q?=E7=B4=A0=EF=BC=9B=E6=9B=B4=E6=8D=A2=E7=94=9F=E4=BA=A7=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=EF=BC=9B=E4=BC=98=E5=8C=96=E5=88=86=E4=BA=AB=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api.js | 4 ++-- components/home/index.vue | 2 +- components/productWindow/index.vue | 4 ++-- config/app.js | 3 ++- pages/goods_details/index.vue | 4 ++-- pages/goods_details/productWindow.vue | 4 ++-- pages/index/component/goodList.vue | 2 +- pages/news_details/index.vue | 19 ++++++++++++++++--- pages/users/user_info/index.vue | 4 ++-- pages/users/user_setting/index.vue | 8 ++++---- project.config.json | 3 ++- 11 files changed, 36 insertions(+), 21 deletions(-) diff --git a/api/api.js b/api/api.js index 90651be..aa05a07 100644 --- a/api/api.js +++ b/api/api.js @@ -112,8 +112,8 @@ export function getArticleDetails(id){ * @param int id * */ -export function shareArticle(type){ - return request.get('user/brand',{type:3},{noAuth:true}); +export function shareArticle(type,id){ + return request.get('user/brand',{type:3,id:id},{noAuth:true}); } /** * 手机号+验证码登录接口 diff --git a/components/home/index.vue b/components/home/index.vue index 209cc4c..14a052a 100644 --- a/components/home/index.vue +++ b/components/home/index.vue @@ -3,7 +3,7 @@ - + diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue index 4fa2e4d..a2a8aa9 100644 --- a/components/productWindow/index.vue +++ b/components/productWindow/index.vue @@ -15,7 +15,7 @@ ￥{{ attr.productSelect.price }} 定金￥{{ attr.productSelect.down_price }} - 库存: {{ attr.productSelect.stock }} + 限量: {{attr.productSelect.quota_show}} @@ -31,7 +31,7 @@ - 库存: {{ attr.productSelect.stock }} + 限量: {{attr.productSelect.quota_show}} diff --git a/config/app.js b/config/app.js index 118617c..560026d 100644 --- a/config/app.js +++ b/config/app.js @@ -7,7 +7,8 @@ let openPlantGrass = '-openPlantGrass-' // 网络接口修改此字符 小程序域名要求https // let httpApi = 'http://192.168.31.110:8324' //测试 // let httpApi = 'https://mer.crmeb.net' //生产 -let httpApi = 'https://b2b2c.njrenzhou.cn' //生产 +// let httpApi = 'https://b2b2c.njrenzhou.cn' //生产 +let httpApi = 'https://shop.freelycar.cn' //生产 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net // let wsApi = 'ws://192.168.3.20:8324' diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index d2b9726..d5a3cd7 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -77,9 +77,9 @@ {{storeInfo.store_name || ''}} - 市场价:￥{{storeInfo.ot_price ? storeInfo.ot_price : ''}} + diff --git a/pages/goods_details/productWindow.vue b/pages/goods_details/productWindow.vue index 28e3db9..a720d36 100644 --- a/pages/goods_details/productWindow.vue +++ b/pages/goods_details/productWindow.vue @@ -13,9 +13,9 @@ - ￥{{ attr.productSelect.price }} + - 库存: {{ attr.productSelect.product_stock }} + diff --git a/pages/index/component/goodList.vue b/pages/index/component/goodList.vue index b02d6fa..aad3268 100644 --- a/pages/index/component/goodList.vue +++ b/pages/index/component/goodList.vue @@ -23,7 +23,7 @@ ¥ {{ item.price }} - ¥{{item.ot_price}} + diff --git a/pages/news_details/index.vue b/pages/news_details/index.vue index 10c0462..38c6923 100644 --- a/pages/news_details/index.vue +++ b/pages/news_details/index.vue @@ -108,7 +108,20 @@ }); }, listenerActionSheet() { - this.shareInfoStatus = true + let that = this; + that.shareInfoStatus = true + // 在这里调用 shareArticle 方法 + shareArticle(3,that.articleInfo.id).then(res =>{ + that.$util.Tips({ + title:res.message + }) + }) + .catch(res=>{ + that.$util.Tips({ + title: res.message + }) + }) + // alert('test'); }, setShareInfoStatus() { this.shareInfoStatus = false @@ -123,7 +136,7 @@ success: function() { // 在这里调用 shareArticle 方法 // this.shareArticle(this.articleInfo.id); - // conso.log('test') + conso.log('test'); } }; this.$wechat.wechatEvevt([ @@ -131,7 +144,7 @@ "updateTimelineShareData" ], configAppMessage).then(res => { this.shareArticle(this.articleInfo.id); - console.log('1'); + console.log('test shareArticle'); }).catch(err => { // console.log(err); console.log('2'); diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue index 64e0d11..28b1b55 100644 --- a/pages/users/user_info/index.vue +++ b/pages/users/user_info/index.vue @@ -91,13 +91,13 @@ - + 注销账号 diff --git a/pages/users/user_setting/index.vue b/pages/users/user_setting/index.vue index dada3ff..9d5ef79 100644 --- a/pages/users/user_setting/index.vue +++ b/pages/users/user_setting/index.vue @@ -7,7 +7,7 @@ - + - + diff --git a/project.config.json b/project.config.json index 46816f3..6fa0c5d 100644 --- a/project.config.json +++ b/project.config.json @@ -45,7 +45,8 @@ }, "compileType": "miniprogram", "libVersion": "2.14.3", - "appid": "wx5fb1cc8edb3f8baa", + // "appid": "wx5fb1cc8edb3f8baa", + "appid": "wx00776fef020b31d7", "projectname": "crmeb_merchant_h5", "simulatorType": "wechat", "simulatorPluginLibVersion": {},