'更换软著京西到家'
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
src="https://image.jxc4.com/image/70143fcf48aefe74537533f35a0a8153.jpg"
|
||||
mode="scaleToFill"
|
||||
/>
|
||||
<view class="name">京西菜市门店管理</view>
|
||||
<view class="name">京西到家商家版管理</view>
|
||||
<!-- cid -->
|
||||
<view class="cid-number" v-show="isShowCid" @tap.stop="copyInfo(getStorage('cid'), 'CID复制成功')">
|
||||
<text class="cid">cid:{{ getStorage('cid') }}</text>
|
||||
@@ -95,7 +95,7 @@ function isUpdate(type: number) {
|
||||
|
||||
function aboutJx() {
|
||||
uni.navigateTo({
|
||||
url: '/subPages/agreement/jxcs?url=https://www.jxc4.com/managerApp/about.html',
|
||||
url: '/subPages/agreement/jxcs?url=https://www.jxc4.com/managerApp/jxdjAbout.html',
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ function agreement(e: AnyObject) {
|
||||
* 用户协议
|
||||
*/
|
||||
function user() {
|
||||
let url = 'https://www.jxc4.com/managerApp/service.html'
|
||||
let url = 'https://www.jxc4.com/managerApp/jxdjService.html'
|
||||
uni.navigateTo({ url: `/subPages/agreement/jxcs?url=${url}` })
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ function user() {
|
||||
* 隐私协议
|
||||
*/
|
||||
function privacy() {
|
||||
let url = 'https://www.jxc4.com/managerApp/privacy.html'
|
||||
let url = 'https://www.jxc4.com/managerApp/jxdjPrivacy.html'
|
||||
uni.navigateTo({ url: `/subPages/agreement/jxcs?url=${url}` })
|
||||
}
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="info">欢迎进入京西菜市</view>
|
||||
<view class="info">欢迎进入京西到家商家版</view>
|
||||
</view>
|
||||
|
||||
<!-- 公共组件 -->
|
||||
|
||||
@@ -14,19 +14,19 @@ import toast from "@/utils/toast";
|
||||
*/
|
||||
// https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png
|
||||
function weixinFn() {
|
||||
const log = ref<string>('https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png')
|
||||
const navTitle = ref<string>('京西菜市商家')
|
||||
const log = ref<string>('https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg')
|
||||
const navTitle = ref<string>('京西到家商家')
|
||||
onShow(() => {
|
||||
console.log('系统类型', getStorage('terrace'));
|
||||
if (getStorage('terrace') == 'jxcs') {
|
||||
log.value = 'https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png'
|
||||
navTitle.value = '京西菜市商家'
|
||||
log.value = 'https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg'
|
||||
navTitle.value = '京西到家商家'
|
||||
} else if(getStorage('terrace') == 'jxgy'){
|
||||
log.value = 'https://image.jxc4.com/image/9e26e6d4e8646d340c21dfe595ac4d08.jpg'
|
||||
navTitle.value = '京西果园商家'
|
||||
}else{
|
||||
log.value = 'https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg'
|
||||
navTitle.value = '京西到家商家'
|
||||
log.value = 'https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png'
|
||||
navTitle.value = '京西超市商家'
|
||||
}
|
||||
// 获取cid
|
||||
plus.push.getClientInfoAsync((info) => {
|
||||
@@ -85,7 +85,7 @@ function weixinFn() {
|
||||
* 用户协议
|
||||
*/
|
||||
function user() {
|
||||
let url = 'https://www.jxc4.com/managerApp/service.html'
|
||||
let url = 'https://www.jxc4.com/managerApp/jxdjService.html'
|
||||
uni.navigateTo({ url: `/subPages/agreement/jxcs?url=${url}` })
|
||||
}
|
||||
|
||||
@@ -94,7 +94,7 @@ function weixinFn() {
|
||||
* 隐私协议
|
||||
*/
|
||||
function privacy() {
|
||||
let url = 'https://www.jxc4.com/managerApp/privacy.html'
|
||||
let url = 'https://www.jxc4.com/managerApp/jxdjPrivacy.html'
|
||||
uni.navigateTo({ url: `/subPages/agreement/jxcs?url=${url}` })
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@ function weixinFn() {
|
||||
uni.showActionSheet({
|
||||
title: '请选择使用平台',
|
||||
itemColor: '#5ab83e',
|
||||
itemList: ['京西菜市商家', '京西果园商家','京西到家商家'],
|
||||
itemList: ['京西到家商家', '京西果园商家','京西超市商家'],
|
||||
popover: {
|
||||
width: 5000,
|
||||
},
|
||||
@@ -120,11 +120,11 @@ function weixinFn() {
|
||||
title: '正在切换系统',
|
||||
})
|
||||
timer = setTimeout(() => {
|
||||
// 京西菜市商家
|
||||
// 京西到家商家
|
||||
if (res.tapIndex == 0) {
|
||||
setStorage('terrace', 'jxcs')
|
||||
log.value = 'https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png'
|
||||
navTitle.value = '京西菜市商家'
|
||||
log.value = 'https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg'
|
||||
navTitle.value = '京西到家商家'
|
||||
}
|
||||
// 京西果园商家
|
||||
if (res.tapIndex == 1) {
|
||||
@@ -136,8 +136,8 @@ function weixinFn() {
|
||||
// 京西到家商家
|
||||
if (res.tapIndex == 2) {
|
||||
setStorage('terrace', 'gblm')
|
||||
log.value = 'https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg'
|
||||
navTitle.value = '京西到家商家'
|
||||
log.value = 'https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png'
|
||||
navTitle.value = '京西超市商家'
|
||||
}
|
||||
uni.hideLoading()
|
||||
toast('切换成功', 1)
|
||||
|
||||
@@ -15,19 +15,19 @@ export default {
|
||||
})
|
||||
}
|
||||
|
||||
const log = ref<string>('https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png')
|
||||
const navTitle = ref<string>('京西菜市商家')
|
||||
const log = ref<string>('https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg')
|
||||
const navTitle = ref<string>('京西到家商家')
|
||||
onShow(() => {
|
||||
isDownWx()
|
||||
if (getStorage('terrace') == 'jxcs') {
|
||||
log.value = 'https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png'
|
||||
navTitle.value = '京西菜市商家'
|
||||
log.value = 'https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg'
|
||||
navTitle.value = '京西到家商家'
|
||||
} else if(getStorage('terrace') == 'jxgy'){
|
||||
log.value = 'https://image.jxc4.com/image/9e26e6d4e8646d340c21dfe595ac4d08.jpg'
|
||||
navTitle.value = '京西果园商家'
|
||||
}else{
|
||||
log.value = 'https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg'
|
||||
navTitle.value = '京西到家商家'
|
||||
log.value = 'https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png'
|
||||
navTitle.value = '京西超市商家'
|
||||
}
|
||||
// 获取cid
|
||||
plus.push.getClientInfoAsync((info) => {
|
||||
@@ -50,7 +50,7 @@ export default {
|
||||
* 用户协议
|
||||
*/
|
||||
function user() {
|
||||
let url = 'https://www.jxc4.com/managerApp/service.html'
|
||||
let url = 'https://www.jxc4.com/managerApp/jxdjService.html'
|
||||
uni.navigateTo({ url: `/subPages/agreement/jxcs?url=${url}` })
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ export default {
|
||||
* 隐私协议
|
||||
*/
|
||||
function privacy() {
|
||||
let url = 'https://www.jxc4.com/managerApp/privacy.html'
|
||||
let url = 'https://www.jxc4.com/managerApp/jxdjPrivacy.html'
|
||||
uni.navigateTo({ url: `/subPages/agreement/jxcs?url=${url}` })
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@ export default {
|
||||
uni.showActionSheet({
|
||||
title: '请选择使用平台',
|
||||
itemColor: '#5ab83e',
|
||||
itemList: ['京西菜市商家', '京西果园商家','京西到家商家'],
|
||||
itemList: ['京西到家商家', '京西果园商家','京西超市商家'],
|
||||
popover: {
|
||||
width: 5000,
|
||||
},
|
||||
@@ -110,11 +110,11 @@ export default {
|
||||
title: '正在切换系统',
|
||||
})
|
||||
timer = setTimeout(() => {
|
||||
// 京西菜市商家
|
||||
// 京西到家商家
|
||||
if (res.tapIndex == 0) {
|
||||
setStorage('terrace', 'jxcs')
|
||||
log.value = 'https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png'
|
||||
navTitle.value = '京西菜市商家'
|
||||
log.value = 'https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg'
|
||||
navTitle.value = '京西到家商家'
|
||||
}
|
||||
// 京西果园商家
|
||||
if (res.tapIndex == 1) {
|
||||
@@ -125,8 +125,8 @@ export default {
|
||||
// 京西到家商家
|
||||
if (res.tapIndex == 2) {
|
||||
setStorage('terrace', 'gblm')
|
||||
log.value = 'https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg'
|
||||
navTitle.value = '京西到家商家'
|
||||
log.value = 'https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png'
|
||||
navTitle.value = '京西超市商家'
|
||||
}
|
||||
|
||||
uni.hideLoading()
|
||||
|
||||
@@ -39,14 +39,14 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="info">欢迎进入京西菜市</view>
|
||||
<view class="info">欢迎进入京西到家商家版</view>
|
||||
|
||||
<uni-popup ref="wxPopup" type="bottom">
|
||||
<view class="wxPopup-root">
|
||||
<view class="text">
|
||||
<view class="agreement-title">用户协议及隐私协议</view>
|
||||
<view class="content">
|
||||
本协议系您与成都若溪科技有限公司就京西菜市帐号的注册和使用而订立的。成都若溪科技有限公司(如下简称“京西菜市”)在此特别提醒您认真阅读、充分理解本协议各条款,特别是涉及服务费用条款,免除或者限制京西菜市责任的条款,对您的权利限制条款,争议解决和法律适用条款等,此类条款将以加粗的形式提示您注意。请您审慎阅读并选择接受或不接受本协议(限制民事行为能力人应在监护人或法定代理人陪同下阅读)。除非您接受本协议所有条款,否则您无权注册、使用京西菜市帐号。您的注册和使用京西菜市帐号行为将视为您已充分理解本协议(即本协议及后续更新版本或开通或使用某项服务的单项协议),并同意接受本协议各项条款的约束。
|
||||
本协议系您与成都若溪科技有限公司就京西到家商家版帐号的注册和使用而订立的。成都若溪科技有限公司(如下简称“京西到家”)在此特别提醒您认真阅读、充分理解本协议各条款,特别是涉及服务费用条款,免除或者限制京西到家责任的条款,对您的权利限制条款,争议解决和法律适用条款等,此类条款将以加粗的形式提示您注意。请您审慎阅读并选择接受或不接受本协议(限制民事行为能力人应在监护人或法定代理人陪同下阅读)。除非您接受本协议所有条款,否则您无权注册、使用京西到家帐号。您的注册和使用京西到家帐号行为将视为您已充分理解本协议(即本协议及后续更新版本或开通或使用某项服务的单项协议),并同意接受本协议各项条款的约束。
|
||||
</view>
|
||||
<view class="agreement">
|
||||
点击同意即代表您已阅读并同意
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<view class="backstageApp-root">
|
||||
<view class="title-root"
|
||||
>Android由于省电设置与后台进程限制,为了确保京西菜市在后台或者锁屏状态下有一个好的运行效果,请检查以下设置都已按要求设置完成。
|
||||
>Android由于省电设置与后台进程限制,为了确保京西到家在后台或者锁屏状态下有一个好的运行效果,请检查以下设置都已按要求设置完成。
|
||||
<br />
|
||||
注意:通知权限较为特殊请按教程进行设置。</view
|
||||
>
|
||||
|
||||
@@ -21,14 +21,14 @@ export default {
|
||||
const dayList = ref(["休息到明天", "休息到后天"]); // 临时休息时间段
|
||||
const currentTime = ref(0)
|
||||
const storeName = ref('') // 门店名称
|
||||
const logoUrl = ref('https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png')
|
||||
const logoUrl = ref('https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg')
|
||||
|
||||
const { isTxd } = useGlobalFunc()
|
||||
|
||||
onLoad(async () => {
|
||||
store.commit('storeInfo/jxLoadingFn', true)
|
||||
if (getStorage('terrace') === 'jxgy') logoUrl.value = 'https://image.jxc4.com/image/9e26e6d4e8646d340c21dfe595ac4d08.jpg'
|
||||
else if (getStorage('terrace') === 'gblm') logoUrl.value = 'https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg'
|
||||
else if (getStorage('terrace') === 'gblm') logoUrl.value = 'https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png'
|
||||
await getStores()
|
||||
store.commit('storeInfo/jxLoadingFn', false)
|
||||
})
|
||||
|
||||
@@ -28,7 +28,7 @@ export default {
|
||||
const invoice_contact_phone = ref('')
|
||||
const storeName = ref('') // 门店名称
|
||||
const ebaiStore = ref<any>({})
|
||||
const logoUrl = ref('https://image.jxc4.com/image/5cd356df441a32295798f78a39491464.png')
|
||||
const logoUrl = ref('https://image.jxc4.com/image/9b9436561e7ff7d8d764787b1aa5182e.jpg')
|
||||
|
||||
onLoad(async () => {
|
||||
store.commit('storeInfo/jxLoadingFn', true)
|
||||
|
||||
@@ -129,16 +129,16 @@ function setUp() {
|
||||
{
|
||||
id: 1,
|
||||
title: '用户协议',
|
||||
url: 'https://www.jxc4.com/managerApp/service.html',
|
||||
url: 'https://www.jxc4.com/managerApp/jxdjService.html',
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
title: '隐私协议',
|
||||
url: 'https://www.jxc4.com/managerApp/privacy.html',
|
||||
url: 'https://www.jxc4.com/managerApp/jxdjPrivacy.html',
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
title: '关于京西菜市',
|
||||
title: '关于京西到家',
|
||||
url: '/subPages/agreement/updateVersion',
|
||||
},
|
||||
])
|
||||
@@ -372,14 +372,12 @@ function setUp() {
|
||||
* IM单聊状态设置
|
||||
*/
|
||||
async function switchImMtStoreStatus(e: AnyObject, vendorID: number) {
|
||||
let data = [
|
||||
{
|
||||
let data = [{
|
||||
vendorID: vendorID,
|
||||
vendorStoreID: vendorID === 1 ? mtStoreInfo.value.vendorStoreID + '' : ebStoreInfo.value.vendorStoreID + '',
|
||||
vendorOrgCode: vendorID === 1 ? mtStoreInfo.value.vendorOrgCode + '' : ebStoreInfo.value.vendorOrgCode + '',
|
||||
imStatus: e.detail.value ? 1 : 0
|
||||
}
|
||||
]
|
||||
}]
|
||||
let res = await merchant.set_mt_store_im_status({ data: JSON.stringify(data) })
|
||||
if (res.code == 0) {
|
||||
let brr: any = []
|
||||
|
||||
@@ -145,10 +145,28 @@ const msgChatFn = function () {
|
||||
}, index)
|
||||
content = ''
|
||||
} else {
|
||||
if (msg.elements && msg.elements.length) {
|
||||
// contentType 为'8'
|
||||
let findItem = msg.elements.filter((item: { elementType: number }) => item.elementType === 1)
|
||||
content = findItem && findItem.length > 0 ? JSON.parse(findItem[0].elementContent).text.replace('@商家', '') : ''
|
||||
if(resData.msgContent.payLoad.contentType == 101 && msg.type == 7){
|
||||
// 101、自定义消息-商品卡片
|
||||
analyUrl({
|
||||
mediaID: msg.data.item.id,
|
||||
platformShopID: '' + ebStore.vendorStoreID
|
||||
}, index)
|
||||
}else if(resData.msgContent.payLoad.contentType == 101 && msg.type == 10052){
|
||||
let json = JSON.parse(msg.data)
|
||||
let json1 = JSON.parse(resData.msgContent['payLoad'].content)
|
||||
content = json.shortTitle
|
||||
resData.msgContent['payLoad'] = {
|
||||
...resData.msgContent['payLoad'],
|
||||
content:{
|
||||
...json1,
|
||||
data:JSON.parse(json1.data)
|
||||
}
|
||||
}
|
||||
}else{
|
||||
if (msg.elements && msg.elements.length) {
|
||||
let findItem = msg.elements.filter((item: { elementType: number }) => item.elementType === 1)
|
||||
content = findItem && findItem.length > 0 ? JSON.parse(findItem[0].elementContent).text.replace('@商家', '') : ''
|
||||
}
|
||||
}
|
||||
}
|
||||
let msgList = {
|
||||
|
||||
@@ -112,6 +112,19 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view
|
||||
class="chat-text-container"
|
||||
v-else-if="item.msg_type == 101">
|
||||
<!-- 自定义消息卡片 -->
|
||||
<view>
|
||||
<view class="top">{{ item.msg_content }}</view>
|
||||
<view class="bottom">
|
||||
{{ item.payLoad.content.data.mistTemplate.error }}
|
||||
<!-- {{ JSON.parse(item.payLoad.content).data }} -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 兜底 -->
|
||||
<view class="chat-text-container" v-else> 【未知信息】 </view>
|
||||
</view>
|
||||
|
||||
Reference in New Issue
Block a user