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

修改

Browse Source
This commit is contained in:
cc_zbp 2023-05-16 09:09:53 +08:00
parent 8b8b5a496a
commit 12a3630870
6 changed files with 58 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
androidPrivacy.json
View File

@ -1,28 +1,29 @@
{ {
"version" : "1", "version": "1",
"prompt" : "template", "prompt": "template",
"title" : "服务协议与隐私政策", "title": "服务协议与隐私政策",
"message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。<br/>\r "message": "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。<br/>\r\r\
\t你可以阅读 <a href=\"https://请修改为自己的域名/register.html\">《用户协议》</a> 与 <a href=\"https://请修改为自己的域名/protocol.html\">《隐私政策》</a>了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。", t你可以阅读 < a href = \
"buttonAccept" : "同意并接受", "https://shop.lihaink.cn/pages/users/user_about/index?from=sys_user_agree\">《用户协议》</a> 与 <a href=\"https://shop.lihaink.cn/pages/users/user_about/index?from=sys_userr_privacy\">《隐私政策》</a>了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。",
"buttonRefuse" : "暂不同意", "buttonAccept": "同意并接受",
"second" : { "buttonRefuse": "暂不同意",
"title" : "确认提示", "second": {
"message" : "进入应用前，你需先同意<a href=\"https://请修改为自己的域名/register.html\">《用户协议》</a> 与 <a href=\"https://请修改为自己的域名/protocol.html\">《隐私政策》</a>，否则将退出应用。", "title": "确认提示",
"buttonAccept" : "同意并继续", "message": "进入应用前，你需先同意<a href=\"https://shop.lihaink.cn/pages/users/user_about/index?from=sys_user_agree\">《用户协议》</a> 与 <a href=\"https://shop.lihaink.cn/pages/users/user_about/index?from=sys_userr_privacy\">《隐私政策》</a>，否则将退出应用。",
"buttonRefuse" : "退出应用" "buttonAccept": "同意并继续",
"buttonRefuse": "退出应用"
},
"styles": {
"backgroundColor": "#fff",
"borderRadius": "5px",
"title": {
"color": "#000"
}, },
"styles" : { "buttonAccept": {
"backgroundColor" : "#fff", "color": "#fff"
"borderRadius" : "5px", },
"title" : { "buttonRefuse": {
"color" : "#000" "color": "#ccc"
},
"buttonAccept" : {
"color" : "#fff"
},
"buttonRefuse" : {
"color" : "#ccc"
}
} }
}
} }

4
components/zbpSwiper.vue
View File

@ -73,10 +73,10 @@
computed: mapGetters(['location']), computed: mapGetters(['location']),
watch: {}, watch: {},
created() { created() {
const loca = JSON.parse(this.location)
this.street = loca.address_component.street
this.getBanner() this.getBanner()
this.Area() this.Area()
const loca = JSON.parse(this.location)
this.street = loca.address_component.street
}, },
methods: { methods: {
selectLocation() { selectLocation() {

36
config/app.js
View File

@ -8,26 +8,26 @@ let httpApiTwo
let httpApiThree let httpApiThree
// 网络接口修改此字符 小程序域名要求https // 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' //测试 // let httpApi = 'http://192.168.31.110:8324' //测试
// httpApi = 'https://shop.lihaink.cn' //生产 httpApi = 'https://shop.lihaink.cn' //生产
// httpApi = 'http://192.168.0.222:8324' //生产 // httpApi = 'http://192.168.0.222:8324' //生产
// httpApiTwo = 'https://nk.lihaink.cn' //生产 httpApiTwo = 'https://nk.lihaink.cn' //生产
if (process.env.NODE_ENV === "development") { // if (process.env.NODE_ENV === "development") {
httpApi = "https://crmeb-test.shop.lihaink.cn" // httpApi = "https://crmeb-test.shop.lihaink.cn"
// #ifdef MP-WEIXIN // // #ifdef MP-WEIXIN
httpApiTwo = "http://cms.com" // httpApiTwo = "http://cms.com"
httpApiThree = 'http://ceshi-oa.lihaink.cn' // httpApiThree = 'http://ceshi-oa.lihaink.cn'
// #endif // // #endif
// #ifdef H5 // // #ifdef H5
// httpApiTwo = "baseUrl" // h5跨域配置 // // httpApiTwo = "baseUrl" // h5跨域配置
httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置 // httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置
// httpApiThree = 'baseUrlTest' // h5跨域配置 // // httpApiThree = 'baseUrlTest' // h5跨域配置
// #endif // // #endif
} else if (process.env.NODE_ENV === 'production') { // } else if (process.env.NODE_ENV === 'production') {
httpApi = 'https://shop.lihaink.cn' // 生产 // httpApi = 'https://shop.lihaink.cn' // 生产
httpApiTwo = 'https://nk.lihaink.cn' // 生产 // httpApiTwo = 'https://nk.lihaink.cn' // 生产
httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 // httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
} // }
// 聊天接口修改此字符 小程序聊天要求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'

37
manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "CRMEB", "name" : "CRMEB",
"appid" : "__UNI__5794595", "appid" : "__UNI__3A527D1",
"description" : "", "description" : "",
"versionName" : "1.0.4", "versionName" : "1.0.4",
"versionCode" : 127, "versionCode" : 127,
@ -21,12 +21,10 @@
/* 模块配置 */ /* 模块配置 */
"modules" : { "modules" : {
"VideoPlayer" : {}, "VideoPlayer" : {},
"OAuth" : {},
"Payment" : {},
"Share" : {},
"iBeacon" : {}, "iBeacon" : {},
"Geolocation" : {}, "Geolocation" : {},
"Maps" : {} "Barcode" : {},
"Camera" : {}
}, },
"safearea" : { "safearea" : {
"bottom" : { "bottom" : {
@ -38,25 +36,16 @@
/* android打包配置 */ /* android打包配置 */
"android" : { "android" : {
"permissions" : [ "permissions" : [
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>", "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>", "<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>", "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>", "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>", "<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>", "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>" "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
], ],
@ -78,7 +67,8 @@
"NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店", "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
"NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店" "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
}, },
"idfa" : false "idfa" : false,
"dSYMs" : false
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : { "sdkConfigs" : {
@ -100,20 +90,13 @@
} }
}, },
"geolocation" : { "geolocation" : {
"amap" : { "system" : {
"__platform__" : [ "ios", "android" ], "__platform__" : [ "ios", "android" ]
"appkey_ios" : "",
"appkey_android" : ""
} }
}, },
"push" : {}, "push" : {},
"oauth" : { "oauth" : {
"apple" : {}, "apple" : {}
"weixin" : {
"appid" : "",
"appsecret" : "",
"UniversalLinks" : "https://mer.crmeb.net/"
}
}, },
"ad" : {} "ad" : {}
}, },
@ -158,7 +141,7 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wxfb4695444ab8d0d0", "appid" : "wx6e14cb98394e36bc",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"minified" : true, "minified" : true,

2
pages/home/index.vue
View File

@ -109,7 +109,6 @@
} }
}, },
onLoad() { onLoad() {
this.getBanner()
this.getCateList() this.getCateList()
this.getGoods() this.getGoods()
this.selfLocation() this.selfLocation()
@ -229,7 +228,6 @@
}, },
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.getBanner()
this.getCateList() this.getCateList()
this.getGoods() this.getGoods()
this.selfLocation() this.selfLocation()

6
pages/nongKe/supply_chain/supplier.vue
View File

@ -73,8 +73,7 @@
</view> </view>
<view class="pro-box" :class="'styleType'+store_street_theme"> <view class="pro-box" :class="'styleType'+store_street_theme">
<navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none" <navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none"
class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn' class="pro-item" v-for="(itemn,indexn) in item.recommend.slice(0,3)" :key='indexn'>
v-if="item.recommend.length<=3">
<view class="picture"> <view class="picture">
<easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage> <easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>
<view v-if="itemn.border_pic" :style="{ backgroundImage: `url(${itemn.border_pic})` }" <view v-if="itemn.border_pic" :style="{ backgroundImage: `url(${itemn.border_pic})` }"
@ -113,8 +112,7 @@
</view> </view>
<view class="pro-box"> <view class="pro-box">
<navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none" <navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none"
class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn' class="pro-item" v-for="(itemn,indexn) in item.recommend.slice(0,3)" :key='indexn'>
v-if="item.recommend.length<=3">
<view class="picture"> <view class="picture">
<easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage> <easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>
<view v-if="itemn.border_pic" :style="{ backgroundImage: `url(${itemn.border_pic})` }" <view v-if="itemn.border_pic" :style="{ backgroundImage: `url(${itemn.border_pic})` }"