From 89e7ed902461f28d6a7dd3e6c927eaf40b154f5e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 15 八月 2024 10:12:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/components/disRealpic/index.js | 2
wechat_staff/pages/login/index.wxml | 4
wechat_staff/pages/login/index.wxss | 1
wechat_jiaxuan/components/disProduct/index.less | 2
wechat_staff/pages/kefu/fond.js | 4
wechat_staff/pages/userinfo/index.less | 10 ++
wechat_staff/pages/consult/detail.js | 4
wechat_jiaxuan/pages/mine/mine.js | 2
wechat_jiaxuan/project.config.json | 2
wechat_staff/project.private.config.json | 4
wechat_jiaxuan/pages/auth/auth.wxml | 4
wechat_staff/components/disProduct/index.less | 4
wechat_staff/pages/userinfo/index.js | 5 +
wechat_staff/pages/login/index.js | 2
wechat_staff/pages/userinfo/index.wxss | 9 ++
wechat_staff/pages/kefu/select.js | 18 ++---
wechat_staff/components/detailFooter/index.js | 4
wechat_staff/pages/sets/protocol.wxss | 8 ++
wechat_staff/utils/config.js | 10 +--
wechat_staff/pages/sets/protocol.wxml | 6 +-
wechat_staff/pages/login/index.less | 1
wechat_staff/pages/userinfo/index.wxml | 6 +-
wechat_staff/pages/store/staff.wxml | 2
wechat_jiaxuan/pages/sets/protocol.wxml | 6 +-
wechat_jiaxuan/utils/config.js | 5 +
wechat_staff/components/disProduct/index.js | 2
wechat_staff/components/disCase/index.js | 2
wechat_jiaxuan/project.private.config.json | 2
wechat_staff/components/disProduct/index.wxss | 4
wechat_staff/pages/download/index.js | 5 +
wechat_jiaxuan/components/disProduct/index.wxss | 2
wechat_staff/pages/kefu/index.js | 4
32 files changed, 87 insertions(+), 59 deletions(-)
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index eaac6c2..6321980 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -165,7 +165,7 @@
}
}
.goods_list {
- height: 100%;
+ height: calc( 100% - 100rpx );
width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index 00ad83b..7d5106f 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -153,7 +153,7 @@
background-color: #333333;
}
.main_content .main_right .goods_list {
- height: 100%;
+ height: calc(100% - 100rpx);
width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
diff --git a/wechat_jiaxuan/pages/auth/auth.wxml b/wechat_jiaxuan/pages/auth/auth.wxml
index e1b98e0..feed215 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxml
+++ b/wechat_jiaxuan/pages/auth/auth.wxml
@@ -23,8 +23,8 @@
<van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
<view class="modal">
<view class="content">
- <!-- <mp-html content="{{activeHtml}}"></mp-html> -->
- <rich-text nodes="{{activeHtml}}"></rich-text>
+ <mp-html content="{{activeHtml}}"></mp-html>
+ <!-- <rich-text nodes="{{activeHtml}}"></rich-text> -->
</view>
<view style="bottom: {{ bottomLift }}px" class="btns">
<view data-flag="{{true}}" bindtap="handleJudge" class="agree">鍚屾剰</view>
diff --git a/wechat_jiaxuan/pages/mine/mine.js b/wechat_jiaxuan/pages/mine/mine.js
index e1e31c0..7c1a7a4 100644
--- a/wechat_jiaxuan/pages/mine/mine.js
+++ b/wechat_jiaxuan/pages/mine/mine.js
@@ -83,7 +83,7 @@
wx.navigateToMiniProgram({
appId: 'wx9910433b937fff92',
path: '',
- envVersion: 'trial',
+ envVersion: 'release',
extraData: {
origin: 'c'
}
diff --git a/wechat_jiaxuan/pages/sets/protocol.wxml b/wechat_jiaxuan/pages/sets/protocol.wxml
index 39e322d..92e148e 100644
--- a/wechat_jiaxuan/pages/sets/protocol.wxml
+++ b/wechat_jiaxuan/pages/sets/protocol.wxml
@@ -1,4 +1,4 @@
-<view style="width: 100%;height: auto;padding: 0px 40rpx;">
-<!-- <mp-html content="{{activeHtml}}"> </mp-html> -->
-<rich-text nodes="{{activeHtml}}"></rich-text>
+<view style="height: auto;padding: 0px 40rpx;">
+<mp-html content="{{activeHtml}}"> </mp-html>
+<!-- <rich-text nodes="{{activeHtml}}"></rich-text> -->
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/project.config.json b/wechat_jiaxuan/project.config.json
index 40f12a2..6f2d575 100644
--- a/wechat_jiaxuan/project.config.json
+++ b/wechat_jiaxuan/project.config.json
@@ -1,5 +1,5 @@
{
- "appid": "wxcd2b89fd2ff065f8",
+ "appid": "wx208dd1edc0be24ee",
"compileType": "miniprogram",
"libVersion": "3.4.10",
"packOptions": {
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index cec8671..44e6371 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -2,7 +2,7 @@
"projectname": "wechat_jiaxuan",
"setting": {
"compileHotReLoad": true,
- "urlCheck": false
+ "urlCheck": true
},
"description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"libVersion": "3.4.10",
diff --git a/wechat_jiaxuan/utils/config.js b/wechat_jiaxuan/utils/config.js
index ef1c60f..84f81a4 100644
--- a/wechat_jiaxuan/utils/config.js
+++ b/wechat_jiaxuan/utils/config.js
@@ -4,7 +4,10 @@
// export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //娴嬭瘯鏈嶅姟鍣�
-export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
+// 娴嬭瘯鏈嶅姟鍣�
+// export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
+// 鐢熶骇鏈嶅姟鍣�
+export const baseUrl = 'https://zbyj.zbom.com/web_interface'
// 鑵捐鍦板浘寮�鍙戣�� key
export const qqMapKey = 'HIDBZ-2QXL4-TAWUD-XET6Q-EKTJE-CCBSQ'
diff --git a/wechat_staff/components/detailFooter/index.js b/wechat_staff/components/detailFooter/index.js
index 7991f46..24f4e0e 100644
--- a/wechat_staff/components/detailFooter/index.js
+++ b/wechat_staff/components/detailFooter/index.js
@@ -43,9 +43,9 @@
id: info.id
})
wx.navigateToMiniProgram({
- appId: 'wxcd2b89fd2ff065f8',
+ appId: 'wx208dd1edc0be24ee',
path: `${map[path]}?origin=b&id=${info.id}&userId=${wx.getStorageSync('member').id}`,
- envVersion: 'trial'
+ envVersion: 'release'
})
},
handleEnjoy() {
diff --git a/wechat_staff/components/disCase/index.js b/wechat_staff/components/disCase/index.js
index d1d754d..77e8f55 100644
--- a/wechat_staff/components/disCase/index.js
+++ b/wechat_staff/components/disCase/index.js
@@ -115,7 +115,7 @@
getZhongTaiWholecasePage({
catalogCode,pageNum,pageSize,tagCodes, sortType,query
}).then(res => {
- if(res.data || res.data.records){
+ if(res.data && res.data.records){
this.setData({
total: res.data.total,
dataList: [...this.data.dataList, ...res.data.records],
diff --git a/wechat_staff/components/disProduct/index.js b/wechat_staff/components/disProduct/index.js
index 114c58b..7bde532 100644
--- a/wechat_staff/components/disProduct/index.js
+++ b/wechat_staff/components/disProduct/index.js
@@ -139,7 +139,7 @@
getZhongTaiProductPage({
catalogCode,pageNum,pageSize,sortType,query,tagCodes
}).then(res => {
- if(res.data || res.data.records){
+ if(res.data && res.data.records){
this.setData({
datalist: [...this.data.datalist, ...res.data.records],
total: res.data.total
diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index 2d8c1c7..4c50090 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -166,7 +166,7 @@
}
.goods_list {
- height: 100%;
+ height: calc( 100% - 100rpx );
width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
@@ -174,7 +174,7 @@
height: 92rpx;
}
.item {
- width: 242rpx;
+ width: 240rpx;
float: left;
margin-bottom: 32rpx;
// margin-right: 26rpx;
diff --git a/wechat_staff/components/disProduct/index.wxss b/wechat_staff/components/disProduct/index.wxss
index bd5aa69..b1e47c1 100644
--- a/wechat_staff/components/disProduct/index.wxss
+++ b/wechat_staff/components/disProduct/index.wxss
@@ -151,7 +151,7 @@
background-color: #333333;
}
.main_content .main_right .goods_list {
- height: 100%;
+ height: calc(100% - 100rpx);
width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
@@ -160,7 +160,7 @@
height: 92rpx;
}
.main_content .main_right .goods_list .item {
- width: 242rpx;
+ width: 240rpx;
float: left;
margin-bottom: 32rpx;
}
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index 94dce6b..115e369 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -118,7 +118,7 @@
getZhongTaiRealcasePage({
catalogCode,tagCodes,pageNum,pageSize, sortType,query
}).then(res => {
- if(res.data || res.data.records){
+ if(res.data && res.data.records){
this.setData({
dataList: [...this.data.dataList, ...res.data.records],
total: res.data.total
diff --git a/wechat_staff/pages/consult/detail.js b/wechat_staff/pages/consult/detail.js
index 55ba4f7..41e3ccb 100644
--- a/wechat_staff/pages/consult/detail.js
+++ b/wechat_staff/pages/consult/detail.js
@@ -28,9 +28,9 @@
id: this.data.info.id
})
wx.navigateToMiniProgram({
- appId: 'wxcd2b89fd2ff065f8',
+ appId: 'wx208dd1edc0be24ee',
path: `/pages/consult/detail?id=${this.data.info.id}&origin=b&userId=${wx.getStorageSync('member').id}`,
- envVersion: 'trial'
+ envVersion: 'release'
})
},
getDetail(id) {
diff --git a/wechat_staff/pages/download/index.js b/wechat_staff/pages/download/index.js
index dff5661..2c3d458 100644
--- a/wechat_staff/pages/download/index.js
+++ b/wechat_staff/pages/download/index.js
@@ -119,6 +119,11 @@
})
}
+ },
+ fail(err) {
+ wx.showToast({
+ title: '鍥剧墖涓嬭浇澶辫触',icon: 'none'
+ })
}
})
}
diff --git a/wechat_staff/pages/kefu/fond.js b/wechat_staff/pages/kefu/fond.js
index d14d877..3218f5a 100644
--- a/wechat_staff/pages/kefu/fond.js
+++ b/wechat_staff/pages/kefu/fond.js
@@ -110,9 +110,9 @@
]
console.log(info.id)
wx.navigateToMiniProgram({
- appId: 'wxcd2b89fd2ff065f8',
+ appId: 'wx208dd1edc0be24ee',
path: `${map[info.joinType]}?origin=b&id=${info.id}&userId=${wx.getStorageSync('member').id}`,
- envVersion: 'trial'
+ envVersion: 'release'
})
},
handleDown() {
diff --git a/wechat_staff/pages/kefu/index.js b/wechat_staff/pages/kefu/index.js
index cda3d5c..588fe1d 100644
--- a/wechat_staff/pages/kefu/index.js
+++ b/wechat_staff/pages/kefu/index.js
@@ -24,9 +24,9 @@
handleShare() {
const { info } = this.data
wx.navigateToMiniProgram({
- appId: 'wxcd2b89fd2ff065f8',
+ appId: 'wx208dd1edc0be24ee',
path: `/pages/kefu/index?title=涓撳睘瀹㈡湇&id=${info.id}`,
- envVersion: 'trial'
+ envVersion: 'release'
})
},
getDetail(id) {
diff --git a/wechat_staff/pages/kefu/select.js b/wechat_staff/pages/kefu/select.js
index f73eda1..9fcf601 100644
--- a/wechat_staff/pages/kefu/select.js
+++ b/wechat_staff/pages/kefu/select.js
@@ -41,7 +41,7 @@
customer
} = this.data
const enjoyList = wx.getStorageSync('enjoyList') || []
- if (!customer.userId) return wx.showToast({
+ if (!customer.customerId) return wx.showToast({
title: '璇峰厛閫夋嫨瑕佸叧鑱旂殑瀹㈡埛',
icon: 'none'
})
@@ -58,21 +58,19 @@
icon: 'none'
})
}, 500)
+ this.setData({
+ customer: {},
+ total: 0,
+ dataList: [],
+ page: 1
+ })
+ this.getList()
}else{
return wx.showToast({
title: res.message,
icon: 'none'
})
}
- this.setData({
- customer: {}
- })
- this.setData({
- total: 0,
- dataList: [],
- page: 1
- })
- this.getList()
})
},
tabsClick(e) {
diff --git a/wechat_staff/pages/login/index.js b/wechat_staff/pages/login/index.js
index 5f0f27a..d7b0acd 100644
--- a/wechat_staff/pages/login/index.js
+++ b/wechat_staff/pages/login/index.js
@@ -119,6 +119,7 @@
}else{
wx.showToast({
title: '浣犺繕涓嶆槸璇ョ郴缁熺敤鎴凤紝璇疯仈绯荤浉鍏崇鐞嗗憳娉ㄥ唽',
+ icon: 'none'
})
}
})
@@ -201,6 +202,7 @@
}else{
wx.showToast({
title: '浣犺繕涓嶆槸璇ョ郴缁熺敤鎴凤紝璇疯仈绯荤浉鍏崇鐞嗗憳娉ㄥ唽',
+ icon: 'none'
})
}
diff --git a/wechat_staff/pages/login/index.less b/wechat_staff/pages/login/index.less
index 14fd823..225cc23 100644
--- a/wechat_staff/pages/login/index.less
+++ b/wechat_staff/pages/login/index.less
@@ -42,6 +42,7 @@
border-bottom: 1rpx solid #E5E5E5;
.icon{
width: 40rpx;
+ height: 40rpx;
}
.input{
flex: 1;
diff --git a/wechat_staff/pages/login/index.wxml b/wechat_staff/pages/login/index.wxml
index 70c204b..78c244f 100644
--- a/wechat_staff/pages/login/index.wxml
+++ b/wechat_staff/pages/login/index.wxml
@@ -36,8 +36,8 @@
<van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
<view class="modal">
<view class="content">
- <!-- <mp-html content="{{activeHtml}}"></mp-html> -->
- <rich-text nodes="{{activeHtml}}"></rich-text>
+ <mp-html content="{{activeHtml}}"></mp-html>
+ <!-- <rich-text nodes="{{activeHtml}}"></rich-text> -->
</view>
<view style="bottom: {{ bottomLift }}px" class="btns">
<view data-flag="{{true}}" bindtap="handleJudge" class="agree">鍚屾剰</view>
diff --git a/wechat_staff/pages/login/index.wxss b/wechat_staff/pages/login/index.wxss
index 923ef39..f68f586 100644
--- a/wechat_staff/pages/login/index.wxss
+++ b/wechat_staff/pages/login/index.wxss
@@ -44,6 +44,7 @@
}
.btns .line .icon {
width: 40rpx;
+ height: 40rpx;
}
.btns .line .input {
flex: 1;
diff --git a/wechat_staff/pages/sets/protocol.wxml b/wechat_staff/pages/sets/protocol.wxml
index 5c1edf4..b3d6d71 100644
--- a/wechat_staff/pages/sets/protocol.wxml
+++ b/wechat_staff/pages/sets/protocol.wxml
@@ -1,5 +1,5 @@
<!--pages/sets/protocol.wxml-->
-<view style="width: 100%;height: auto;padding: 0px 40rpx;">
-<!-- <mp-html content="{{content}}"> </mp-html> -->
-<rich-text nodes="{{content}}"></rich-text>
+<view class="content">
+ <!-- <rich-text nodes="{{content}}"></rich-text> -->
+ <mp-html content="{{content}}"></mp-html>
</view>
diff --git a/wechat_staff/pages/sets/protocol.wxss b/wechat_staff/pages/sets/protocol.wxss
index 30e4241..c0c8100 100644
--- a/wechat_staff/pages/sets/protocol.wxss
+++ b/wechat_staff/pages/sets/protocol.wxss
@@ -1 +1,7 @@
-/* pages/sets/protocol.wxss */
\ No newline at end of file
+.content{
+ width: 750rpx;
+ box-sizing: border-box;
+ padding: 12rpx 40rpx;
+ overflow-y: auto;
+ overflow-x: hidden;
+}
\ No newline at end of file
diff --git a/wechat_staff/pages/store/staff.wxml b/wechat_staff/pages/store/staff.wxml
index 59d9532..8f9344a 100644
--- a/wechat_staff/pages/store/staff.wxml
+++ b/wechat_staff/pages/store/staff.wxml
@@ -3,7 +3,7 @@
<view class="bg_wrap">
<image src="../../static/images/design_banner@2x.png" mode="widthFix" ></image>
</view>
- <view bindtap="jumpUser" class="editBtn">缂栬緫璧勬枡</view>
+ <view wx:if="{{ !isShow }}" bindtap="jumpUser" class="editBtn">缂栬緫璧勬枡</view>
<view class="container">
<image class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
<view class="name_wrap">
diff --git a/wechat_staff/pages/userinfo/index.js b/wechat_staff/pages/userinfo/index.js
index c358260..38c7499 100644
--- a/wechat_staff/pages/userinfo/index.js
+++ b/wechat_staff/pages/userinfo/index.js
@@ -16,6 +16,7 @@
qrcodeImgFull: '',
companyQrcodeImg: '',
companyQrcodeImgFull: '',
+ bottomLift: 0,
userInfo: {
name: '',
phone: '',
@@ -30,8 +31,10 @@
},
onLoad(options) {
const endDate = new Date().getFullYear() + '-09-01'
+ var app = getApp().globalData
this.setData({
- endDate
+ endDate,
+ bottomLift: app.bottomLift
})
this.getUserInfo()
},
diff --git a/wechat_staff/pages/userinfo/index.less b/wechat_staff/pages/userinfo/index.less
index cbd0b51..6a6ae7f 100644
--- a/wechat_staff/pages/userinfo/index.less
+++ b/wechat_staff/pages/userinfo/index.less
@@ -1,3 +1,6 @@
+.main_app{
+ padding: 0 0 148rpx;
+}
.avatar{
margin: 52rpx auto 40rpx;
width: 160rpx;
@@ -6,6 +9,7 @@
box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(0,0,0,0.08);
border: 4rpx solid #FFFFFF;
}
+
.avatar_btn{
width: 168rpx;
height: 60rpx;
@@ -67,17 +71,19 @@
justify-content: space-between;
}
.save{
+ position: fixed;
color: #fff;
display: flex;
justify-content: center;
align-items: center;
width: 670rpx;
height: 88rpx;
+ left: 40rpx;
+ bottom: 12rpx;
+ z-index: 999;
background: var(--themeColor);
border-radius: 8rpx;
font-weight: 500;
font-size: 32rpx;
- margin-top: 20rpx;
- margin-bottom: 10rpx;
}
}
\ No newline at end of file
diff --git a/wechat_staff/pages/userinfo/index.wxml b/wechat_staff/pages/userinfo/index.wxml
index e3922f3..2ac3e5e 100644
--- a/wechat_staff/pages/userinfo/index.wxml
+++ b/wechat_staff/pages/userinfo/index.wxml
@@ -1,4 +1,4 @@
-<view class="container">
+<view class="main_app">
<image class="avatar" src="{{ userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png' }}"></image>
<!-- <button open-type="chooseAvatar" bindchooseavatar="getBindchooseavatar" class="avatar_btn">鏇存崲澶村儚</button> -->
<button hover-class="none" bind:tap="selMedia3" class="avatar_btn">鏇存崲澶村儚</button>
@@ -67,8 +67,8 @@
<image wx:if="{{ editFalg }}" class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
</view>
- <view wx:if="{{ !editFalg }}" bindtap="startEdit" class="save">缂栬緫</view>
- <view wx:else bindtap="onSubmit" class="save">淇濆瓨</view>
+ <view wx:if="{{ !editFalg }}" style="bottom: {{bottomLift + 4}}px;" bindtap="startEdit" class="save">缂栬緫</view>
+ <view wx:else bindtap="onSubmit" style="bottom: {{bottomLift + 4}}px;" class="save">淇濆瓨</view>
</view>
<!-- -->
</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/userinfo/index.wxss b/wechat_staff/pages/userinfo/index.wxss
index a630098..c9ed61b 100644
--- a/wechat_staff/pages/userinfo/index.wxss
+++ b/wechat_staff/pages/userinfo/index.wxss
@@ -1,3 +1,6 @@
+.main_app {
+ padding: 0 0 148rpx;
+}
.avatar {
margin: 52rpx auto 40rpx;
width: 160rpx;
@@ -66,16 +69,18 @@
justify-content: space-between;
}
.list .save {
+ position: fixed;
color: #fff;
display: flex;
justify-content: center;
align-items: center;
width: 670rpx;
height: 88rpx;
+ left: 40rpx;
+ bottom: 12rpx;
+ z-index: 999;
background: var(--themeColor);
border-radius: 8rpx;
font-weight: 500;
font-size: 32rpx;
- margin-top: 20rpx;
- margin-bottom: 10rpx;
}
diff --git a/wechat_staff/project.private.config.json b/wechat_staff/project.private.config.json
index 4a5a27e..8bd54e7 100644
--- a/wechat_staff/project.private.config.json
+++ b/wechat_staff/project.private.config.json
@@ -2,7 +2,7 @@
"projectname": "wechat_staff",
"setting": {
"compileHotReLoad": true,
- "urlCheck": false
+ "urlCheck": true
},
"description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"condition": {
@@ -45,7 +45,7 @@
},
{
"name": "",
- "pathName": "pages/consult/consult",
+ "pathName": "pages/store/index",
"query": "",
"launchMode": "default",
"scene": null
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index b0dea33..1376c89 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,10 +1,8 @@
// export const baseUrl = 'http://192.168.0.135:10027'
-// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
-export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
-
-// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
-
-// export const baseUrl = 'https://dmtest.ahapp.net/web_interface/' // 娴嬭瘯鏈�
+// 娴嬭瘯鏈嶅姟鍣�
+// export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
+// 鐢熶骇鏈嶅姟鍣�
+export const baseUrl = 'https://zbyj.zbom.com/web_interface'
// 鑵捐鍦板浘寮�鍙戣�� key
export const qqMapKey = 'HIDBZ-2QXL4-TAWUD-XET6Q-EKTJE-CCBSQ'
--
Gitblit v1.9.3