合并代码

This commit is contained in:
sx 2025-03-01 09:05:16 +08:00
parent 8cd003414f
commit b8527dc284
4 changed files with 2 additions and 26 deletions

View File

@ -6,12 +6,7 @@ const config = {
// host: 'h5api',
// #endif
// #ifndef H5
<<<<<<< HEAD
host: 'http://91f.xyz:8080',
// host: 'http://g8rbs6.natappfree.cc',
=======
host: 'http://91f.xyz:8080',
>>>>>>> 1fb340263bba19031e365ab883932f3f4c4806e3
// #endif
// 支付方式配置
payType: {

View File

@ -89,9 +89,6 @@ function handleBuy() {
//
function toCustomer() {
uni.navigateTo({
url: util.setUrl('/pages/mine/setting/feedback')
})
// api.shop.getCustomerService({ merchantId: props.detail.merId }).then(rs => {
// if (rs.code == 200) {
// let param = {};
@ -133,7 +130,7 @@ function toCustomer() {
</view>
</view>
<view class="option ver" @click="toCustomer">
<view class="option ver" @click="toCustomer" v-if="0">
<image class="wh30" src="/static/customer-service.png" mode="aspectFit" />
<text class="text mt10">客服</text>
</view>

View File

@ -53,17 +53,6 @@ function toCustomer() {
uni.navigateTo({
url: util.setUrl('/pages/mine/setting/feedback')
})
// let param = {};
// param.type = 'C2C'
// param.name = `${props.detail.merName}`
// param.msgId = `${rs.data.serviceId}`
// param.isCustomer = true
// util.toChat(param)
// uni.navigateTo({
// url: util.setUrl('/pages/news/chat/chat', param)
// })
}
</script>
@ -110,7 +99,7 @@ function toCustomer() {
<view class="df">
<!-- 客服 -->
<!-- <image class="ml20 wh40" @click="toCustomer" src="@/static/mine-kefu.png" mode="aspectFill" /> -->
<image class="ml20 wh40" @click="toCustomer" src="@/static/mine-kefu.png" mode="aspectFill" />
<!-- 设置 -->
<image class="ml20 wh40" @click="link('/pages/mine/setting/setting')" src="@/static/mine-shezhi.png"
mode="aspectFill" />

View File

@ -4,11 +4,6 @@ import {
import uni from '@dcloudio/vite-plugin-uni';
let target = 'http://91f.xyz:8080'
<<<<<<< HEAD
// let target = 'http://g8rbs6.natappfree.cc'
=======
>>>>>>> 1fb340263bba19031e365ab883932f3f4c4806e3
export default defineConfig({
plugins: [uni()],