From 9ab223b54f6bde783f8e7783ba731abc2be6835f Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Fri, 28 Jun 2024 15:22:32 +0800
Subject: [PATCH] 1
---
config/app.js | 8 ++++----
manifest.json | 4 ++--
pages.json | 6 ++++++
pages/goods_details/index.vue | 25 +++++++++++++++++++++++++
pages/users/refund/confirm.vue | 11 ++++++++++-
pages/users/user_luckyDraw/index.vue | 12 ++++++------
6 files changed, 53 insertions(+), 13 deletions(-)
diff --git a/config/app.js b/config/app.js
index 14a191c..4584542 100644
--- a/config/app.js
+++ b/config/app.js
@@ -6,12 +6,12 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
let openPlantGrass = '-openPlantGrass-'
// 网络接口修改此字符 小程序域名要求https
-// let httpApi = 'http://192.168.1.3:8080' //测试
-let httpApi = 'https://api.tropjoin.com' //生产
+let httpApi = 'http://192.168.1.24:8080' //测试
+// let httpApi = 'https://api.tropjoin.com' //生产
// 聊天接口修改此字符 小程序聊天要求wss 例如:wss://mer. .net
-// let wsApi = 'ws://192.168.1.3:8080'
-let wsApi = 'wss://ws.tropjoin.com'
+let wsApi = 'ws://192.168.1.24:8080'
+// let wsApi = 'wss://ws.tropjoin.com'
module.exports = {
// 请求域名 格式: https://您的域名
diff --git a/manifest.json b/manifest.json
index 7d16d1c..c35772d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "铸源优品",
"appid" : "__UNI__496DF55",
"description" : "",
- "versionName" : "1.1.0",
- "versionCode" : 137,
+ "versionName" : "1.1.2",
+ "versionCode" : 139,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index ab90a1b..bec1219 100644
--- a/pages.json
+++ b/pages.json
@@ -348,6 +348,12 @@
"navigationBarTitleText": "修改手机号"
}
},
+ {
+ "path": "user_luckyDraw/index",
+ "style": {
+ "navigationBarTitleText": "抽奖"
+ }
+ },
{
"path": "user_modify_pwd/index",
"style": {
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 27eb60e..d7103fe 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -298,6 +298,16 @@
+
+
+
+
+
+
+
+
+
+
产品介绍
@@ -561,6 +571,7 @@
activity: [],
retunTop: true, //顶部返回
navH: "",
+ notice:'',
navList: [],
opacity: 0,
scrollY: 0,
@@ -891,6 +902,14 @@
});
},
+ // /*获取公告说明*/
+ // getNoticeRule() {
+ // priceRuleApi(this.storeInfo.cate_id).then(res => {
+ // this.notice = res.data
+ // }).catch(err => {
+
+ // });
+ // },
goActivity: function(e) {
let item = e;
if (item.type === "1") {
@@ -1117,6 +1136,7 @@
that.$set(that, 'storeImage', that.storeInfo.image);
getProductParmas(that.id).then((res) => {
that.$set(that, 'description', res.data.content);
+ that.$set(that, 'notice', res.data.merchant.mer_notice);
if (that.description.type == 0) {
that.description.content = that.description.content.replace(
/
+
+ 提示: 请5天内上传退货单号,超期此单则无法申请退款。
+
申请退款
@@ -242,6 +245,12 @@