mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api以及商户设置修改

Browse Source
This commit is contained in:
jia 2023-10-09 19:36:17 +08:00
parent 7322947eca
commit 96ae908f11
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/app.js
View File

@ -39,7 +39,7 @@ switch (env) {
// 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
// let wsApi = 'ws://192.168.3.20:8324' // let wsApi = 'ws://192.168.3.20:8324'
let wsApi = 'wss://shop.lihaink.cn' let wsApi = 'wss://shop.lihaink.cn'
console.log(window.location.protocol, '1111111111')
module.exports = { module.exports = {
// 请求域名 格式： https://您的域名 // 请求域名 格式： https://您的域名
// #ifdef MP || APP-PLUS // #ifdef MP || APP-PLUS
@ -52,10 +52,20 @@ module.exports = {
// #endif // #endif
// #ifdef H5 // #ifdef H5
//H5接口是浏览器地址 //H5接口是浏览器地址
HTTP_REQUEST_URL_FOUR: httpApiFour|| window.location.protocol + "//" + window.location.host, HTTP_REQUEST_URL: window.location.host == 'localhost:8080' ? httpApi : window.location.protocol + "//" + window
HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host, .location.host,
HTTP_REQUEST_URL_TWO: httpApiTwo || window.location.protocol + "//" + window.location.host, HTTP_REQUEST_URL_TWO: httpApiTwo,
HTTP_REQUEST_URL_FOUR: window.location.host == 'localhost:8080' ? httpApiFour :
'https://ceshi-worker-task.lihaink.cn',
HTTP_REQUEST_URL_FOUR: window.location.host == 'test.shop.lihaink.cn' ? 'https://preview-worker-task.lihaink.cn' : 'https://ceshi-worker-task.lihaink.cn',
HTTP_REQUEST_URL_FOUR: window.location.host == 'shop.lihaink.cn' ? 'https://worker-task.lihaink.cn' :
'https://preview-worker-task.lihaink.cn',
// 聊天长连接地址 // 聊天长连接地址
VUE_APP_WS_URL: wsApi ? `${wsApi}?type=user` : VUE_APP_WS_URL, VUE_APP_WS_URL: wsApi ? `${wsApi}?type=user` : VUE_APP_WS_URL,
// #endif // #endif

8
pages/moreProject/moreProject.vue
View File

@ -63,7 +63,7 @@
</view> </view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')"> @click="buyserset">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image> <image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
<text class="text">商户设置</text> <text class="text">商户设置</text>
</view> </view>
@ -195,7 +195,7 @@
<text class="text">商品管理</text> <text class="text">商品管理</text>
</view> </view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')"> @click="buyserset">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
</image> </image>
<text class="text">商户设置</text> <text class="text">商户设置</text>
@ -318,7 +318,7 @@
<text class="text">商品管理</text> <text class="text">商品管理</text>
</view> </view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')"> @click="buyserset">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
</image> </image>
<text class="text">商户设置</text> <text class="text">商户设置</text>
@ -390,7 +390,7 @@
<text class="text">商品管理</text> <text class="text">商品管理</text>
</view> </view>
<view class="examine" <view class="examine"
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')"> @click="buyserset">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"> <image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
</image> </image>
<text class="text">商户设置</text> <text class="text">商户设置</text>