mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

批发价格修改

This commit is contained in:
1154079537 2024-05-25 11:19:40 +08:00
parent aa3e8e8b6b
commit 8d3e871c6c
8 changed files with 437 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

683
manifest.json
View File

@ -1,346 +1,345 @@
{ {
"name" : "惠农商户平台", "name": "惠农商户平台",
"appid" : "__UNI__7626C0F", "appid": "__UNI__7626C0F",
"description" : "", "description": "",
"versionName" : "1.5.3", "versionName": "1.5.4",
"versionCode" : 1530, "versionCode": 1540,
"transformPx" : false, "transformPx": false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus": {
"titleNView" : true, "titleNView": true,
"usingComponents" : true, "usingComponents": true,
"nvueCompiler" : "uni-app", "nvueCompiler": "uni-app",
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler": "uni-app",
"compilerVersion" : 3, "compilerVersion": 3,
"compatible" : { "compatible": {
"ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
}, },
"splashscreen" : { "splashscreen": {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender": true,
"waiting" : true, "waiting": true,
"autoclose" : true, "autoclose": true,
"delay" : 0 "delay": 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules" : { "modules": {
"VideoPlayer" : {}, "VideoPlayer": {},
"iBeacon" : {}, "iBeacon": {},
"Barcode" : {}, "Barcode": {},
"Camera" : {}, "Camera": {},
"Geolocation" : {}, "Geolocation": {},
"Payment" : {}, "Payment": {},
"Share" : {}, "Share": {},
"OAuth" : {}, "OAuth": {},
"UniMP" : { "UniMP": {
"description" : "uni小程序" "description": "uni小程序"
}, },
"Maps" : {} "Maps": {}
}, },
"safearea" : { "safearea": {
"bottom" : { "bottom": {
"offset" : "none" "offset": "none"
} }
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute": {
/* android打包配置 */ /* android打包配置 */
"android" : { "android": {
"resizeableActivity" : true, "resizeableActivity": true,
"permissions" : [ "permissions": [
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>", "<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_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_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_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.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.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>", "<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<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_EXTERNAL_STORAGE\"/>", "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
"permissionExternalStorage" : { "permissionExternalStorage": {
"request" : "none", "request": "none",
"prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。" "prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
}, },
"permissionPhoneState" : { "permissionPhoneState": {
"request" : "none" //拨打电话权限关闭 "request": "none" //拨打电话权限关闭
} }
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : { "ios": {
"privacyDescription" : { "privacyDescription": {
"NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报", "NSPhotoLibraryUsageDescription": "上传用户头像保存分享海报",
"NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报", "NSPhotoLibraryAddUsageDescription": "上传用户头像保存分享海报",
"NSCameraUsageDescription" : "上传用户头像保存分享海报", "NSCameraUsageDescription": "上传用户头像保存分享海报",
"NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店", "NSLocationWhenInUseUsageDescription": "根据客户地理位置推荐最近门店",
"NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店", "NSLocationAlwaysUsageDescription": "根据客户地理位置推荐最近门店",
"NSLocationAlwaysAndWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店" "NSLocationAlwaysAndWhenInUseUsageDescription": "根据客户地理位置推荐最近门店"
}, },
"idfa" : false, "idfa": false,
"dSYMs" : false "dSYMs": false
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : { "sdkConfigs": {
"maps" : { "maps": {
"amap" : { "amap": {
"appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d", "appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
"appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945", "appkey_android": "0354f5ddc11e2ea76c5aac647f44d945",
"name" : "amapIvoVHpJR" "name": "amapIvoVHpJR"
} }
}, },
"payment" : { "payment": {
"weixin" : { "weixin": {
"__platform__" : [ "ios", "android" ], "__platform__": ["ios", "android"],
"appid" : "wx9d68c92b550ddd1e", "appid": "wx9d68c92b550ddd1e",
"UniversalLinks" : "https://mer.crmeb.net/" "UniversalLinks": "https://mer.crmeb.net/"
} }
}, },
"share" : { "share": {
"weixin" : { "weixin": {
"appid" : "wx9d68c92b550ddd1e", "appid": "wx9d68c92b550ddd1e",
"UniversalLinks" : "https://mer.crmeb.net/" "UniversalLinks": "https://mer.crmeb.net/"
} }
}, },
"geolocation" : { "geolocation": {
"amap" : { "amap": {
"name" : "amapIvoVHpJR", "name": "amapIvoVHpJR",
"__platform__" : [ "ios", "android" ], "__platform__": ["ios", "android"],
"appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d", "appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
"appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945" "appkey_android": "0354f5ddc11e2ea76c5aac647f44d945"
}, },
"system" : { "system": {
"__platform__" : [ "ios", "android" ] "__platform__": ["ios", "android"]
} }
}, },
"oauth" : {}, "oauth": {},
"ad" : {} "ad": {}
}, },
"icons" : { "icons": {
"android" : { "android": {
"hdpi" : "unpackage/res/icons/72x72.png", "hdpi": "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png", "xhdpi": "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png", "xxhdpi": "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png" "xxxhdpi": "unpackage/res/icons/192x192.png"
}, },
"ios" : { "ios": {
"appstore" : "unpackage/res/icons/1024x1024.png", "appstore": "unpackage/res/icons/1024x1024.png",
"ipad" : { "ipad": {
"app" : "unpackage/res/icons/76x76.png", "app": "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png", "app@2x": "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png", "notification": "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x": "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png", "proapp@2x": "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png", "settings": "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x": "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png", "spotlight": "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png" "spotlight@2x": "unpackage/res/icons/80x80.png"
}, },
"iphone" : { "iphone": {
"app@2x" : "unpackage/res/icons/120x120.png", "app@2x": "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png", "app@3x": "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x": "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png", "notification@3x": "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x": "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png", "settings@3x": "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png", "spotlight@2x": "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png" "spotlight@3x": "unpackage/res/icons/120x120.png"
} }
} }
}, },
"splashscreen" : { "splashscreen": {
"useOriginalMsgbox" : true "useOriginalMsgbox": true
} }
}, },
"nativePlugins" : { "nativePlugins": {
"JG-JCore" : { "JG-JCore": {
"JPUSH_APPKEY_IOS" : "", "JPUSH_APPKEY_IOS": "",
"JPUSH_CHANNEL_IOS" : "", "JPUSH_CHANNEL_IOS": "",
"JPUSH_APPKEY_ANDROID" : "", "JPUSH_APPKEY_ANDROID": "",
"JPUSH_CHANNEL_ANDROID" : "", "JPUSH_CHANNEL_ANDROID": "",
"__plugin_info__" : { "__plugin_info__": {
"name" : "JG-JCore", "name": "JG-JCore",
"description" : "极光推送JCore插件", "description": "极光推送JCore插件",
"platforms" : "Android,iOS", "platforms": "Android,iOS",
"url" : "", "url": "",
"android_package_name" : "", "android_package_name": "",
"ios_bundle_id" : "", "ios_bundle_id": "",
"isCloud" : false, "isCloud": false,
"bought" : -1, "bought": -1,
"pid" : "", "pid": "",
"parameters" : { "parameters": {
"JPUSH_APPKEY_IOS" : { "JPUSH_APPKEY_IOS": {
"des" : "[iOS]极光portal配置应用信息时分配的AppKey", "des": "[iOS]极光portal配置应用信息时分配的AppKey",
"key" : "JCore:APP_KEY", "key": "JCore:APP_KEY",
"value" : "" "value": ""
}, },
"JPUSH_CHANNEL_IOS" : { "JPUSH_CHANNEL_IOS": {
"des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default", "des": "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
"key" : "JCore:CHANNEL", "key": "JCore:CHANNEL",
"value" : "" "value": ""
}, },
"JPUSH_APPKEY_ANDROID" : { "JPUSH_APPKEY_ANDROID": {
"des" : "[Android]极光portal配置应用信息时分配的AppKey", "des": "[Android]极光portal配置应用信息时分配的AppKey",
"key" : "JPUSH_APPKEY", "key": "JPUSH_APPKEY",
"value" : "" "value": ""
}, },
"JPUSH_CHANNEL_ANDROID" : { "JPUSH_CHANNEL_ANDROID": {
"des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default", "des": "[Android]用于统计分发渠道，不需要可填默认值developer-default",
"key" : "JPUSH_CHANNEL", "key": "JPUSH_CHANNEL",
"value" : "" "value": ""
} }
} }
} }
}, },
"JG-JPush" : { "JG-JPush": {
"JPUSH_ISPRODUCTION_IOS" : "", "JPUSH_ISPRODUCTION_IOS": "",
"JPUSH_ADVERTISINGID_IOS" : "", "JPUSH_ADVERTISINGID_IOS": "",
"JPUSH_DEFAULTINITJPUSH_IOS" : "", "JPUSH_DEFAULTINITJPUSH_IOS": "",
"JPUSH_OPPO_APPKEY" : "", "JPUSH_OPPO_APPKEY": "",
"JPUSH_OPPO_APPID" : "", "JPUSH_OPPO_APPID": "",
"JPUSH_OPPO_APPSECRET" : "", "JPUSH_OPPO_APPSECRET": "",
"JPUSH_VIVO_APPKEY" : "", "JPUSH_VIVO_APPKEY": "",
"JPUSH_VIVO_APPID" : "", "JPUSH_VIVO_APPID": "",
"JPUSH_MEIZU_APPKEY" : "", "JPUSH_MEIZU_APPKEY": "",
"JPUSH_MEIZU_APPID" : "", "JPUSH_MEIZU_APPID": "",
"JPUSH_XIAOMI_APPKEY" : "", "JPUSH_XIAOMI_APPKEY": "",
"JPUSH_XIAOMI_APPID" : "", "JPUSH_XIAOMI_APPID": "",
"__plugin_info__" : { "__plugin_info__": {
"name" : "JG-JPush", "name": "JG-JPush",
"description" : "极光推送Hbuilder插件", "description": "极光推送Hbuilder插件",
"platforms" : "Android,iOS", "platforms": "Android,iOS",
"url" : "", "url": "",
"android_package_name" : "", "android_package_name": "",
"ios_bundle_id" : "", "ios_bundle_id": "",
"isCloud" : false, "isCloud": false,
"bought" : -1, "bought": -1,
"pid" : "", "pid": "",
"parameters" : { "parameters": {
"JPUSH_ISPRODUCTION_IOS" : { "JPUSH_ISPRODUCTION_IOS": {
"des" : "[iOS]是否是生产环境，是填true，不是填false或者不填", "des": "[iOS]是否是生产环境，是填true，不是填false或者不填",
"key" : "JPush:ISPRODUCTION", "key": "JPush:ISPRODUCTION",
"value" : "" "value": ""
}, },
"JPUSH_ADVERTISINGID_IOS" : { "JPUSH_ADVERTISINGID_IOS": {
"des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填", "des": "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
"key" : "JPush:ADVERTISINGID", "key": "JPush:ADVERTISINGID",
"value" : "" "value": ""
}, },
"JPUSH_DEFAULTINITJPUSH_IOS" : { "JPUSH_DEFAULTINITJPUSH_IOS": {
"des" : "[iOS]是否默认初始化，是填true，不是填false或者不填", "des": "[iOS]是否默认初始化，是填true，不是填false或者不填",
"key" : "JPush:DEFAULTINITJPUSH", "key": "JPush:DEFAULTINITJPUSH",
"value" : "" "value": ""
}, },
"JPUSH_OPPO_APPKEY" : { "JPUSH_OPPO_APPKEY": {
"des" : "厂商OPPO-appkey,示例：OP-12345678", "des": "厂商OPPO-appkey,示例：OP-12345678",
"key" : "OPPO_APPKEY", "key": "OPPO_APPKEY",
"value" : "" "value": ""
}, },
"JPUSH_OPPO_APPID" : { "JPUSH_OPPO_APPID": {
"des" : "厂商OPPO-appId,示例：OP-12345678", "des": "厂商OPPO-appId,示例：OP-12345678",
"key" : "OPPO_APPID", "key": "OPPO_APPID",
"value" : "" "value": ""
}, },
"JPUSH_OPPO_APPSECRET" : { "JPUSH_OPPO_APPSECRET": {
"des" : "厂商OPPO-appSecret,示例：OP-12345678", "des": "厂商OPPO-appSecret,示例：OP-12345678",
"key" : "OPPO_APPSECRET", "key": "OPPO_APPSECRET",
"value" : "" "value": ""
}, },
"JPUSH_VIVO_APPKEY" : { "JPUSH_VIVO_APPKEY": {
"des" : "厂商VIVO-appkey,示例：12345678", "des": "厂商VIVO-appkey,示例：12345678",
"key" : "com.vivo.push.api_key", "key": "com.vivo.push.api_key",
"value" : "" "value": ""
}, },
"JPUSH_VIVO_APPID" : { "JPUSH_VIVO_APPID": {
"des" : "厂商VIVO-appId,示例：12345678", "des": "厂商VIVO-appId,示例：12345678",
"key" : "com.vivo.push.app_id", "key": "com.vivo.push.app_id",
"value" : "" "value": ""
}, },
"JPUSH_MEIZU_APPKEY" : { "JPUSH_MEIZU_APPKEY": {
"des" : "厂商MEIZU-appKey,示例：MZ-12345678", "des": "厂商MEIZU-appKey,示例：MZ-12345678",
"key" : "MEIZU_APPKEY", "key": "MEIZU_APPKEY",
"value" : "" "value": ""
}, },
"JPUSH_MEIZU_APPID" : { "JPUSH_MEIZU_APPID": {
"des" : "厂商MEIZU-appId,示例：MZ-12345678", "des": "厂商MEIZU-appId,示例：MZ-12345678",
"key" : "MEIZU_APPID", "key": "MEIZU_APPID",
"value" : "" "value": ""
}, },
"JPUSH_XIAOMI_APPKEY" : { "JPUSH_XIAOMI_APPKEY": {
"des" : "厂商XIAOMI-appKey,示例：MI-12345678", "des": "厂商XIAOMI-appKey,示例：MI-12345678",
"key" : "XIAOMI_APPKEY", "key": "XIAOMI_APPKEY",
"value" : "" "value": ""
}, },
"JPUSH_XIAOMI_APPID" : { "JPUSH_XIAOMI_APPID": {
"des" : "厂商XIAOMI-appId,示例：MI-12345678", "des": "厂商XIAOMI-appId,示例：MI-12345678",
"key" : "XIAOMI_APPID", "key": "XIAOMI_APPID",
"value" : "" "value": ""
} }
} }
} }
} }
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp" : {}, "quickapp": {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin": {
"appid" : "wxfb4695444ab8d0d0", "appid": "wxfb4695444ab8d0d0",
"setting" : { "setting": {
"urlCheck" : false, "urlCheck": false,
"minified" : true, "minified": true,
"postcss" : true, "postcss": true,
"es6" : true "es6": true
}, },
"permission" : { "permission": {
"scope.userLocation" : { "scope.userLocation": {
"desc" : "获取您的位置" "desc": "获取您的位置"
} }
}, },
"requiredPrivateInfos" : [ "getLocation", "chooseAddress" ], "requiredPrivateInfos": ["getLocation", "chooseAddress"],
"usingComponents" : true "usingComponents": true
}, },
"mp-alipay" : { "mp-alipay": {
"usingComponents" : true "usingComponents": true
}, },
"mp-baidu" : { "mp-baidu": {
"usingComponents" : true "usingComponents": true
}, },
"mp-toutiao" : { "mp-toutiao": {
"usingComponents" : true "usingComponents": true
}, },
"h5" : { "h5": {
"devServer" : { "devServer": {
"https" : false "https": false
}, },
"router" : { "router": {
"mode" : "history", "mode": "history",
"base" : "" "base": ""
}, },
"domain" : "", "domain": "",
"sdkConfigs" : { "sdkConfigs": {
"maps" : { "maps": {
"qqmap" : { "qqmap": {
"key" : "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7" "key": "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
} }
} }
}, },
"title" : "加载中...", "title": "加载中...",
"template" : "template.h5.html" "template": "template.h5.html"
} }
} }
//拨打电话权限关闭 //拨打电话权限关闭
/* ios打包配置 */ /* ios打包配置 */

20
pages/chat/customer_list/chat.vue
View File

@ -111,7 +111,8 @@
<div class="broadcast_details_img_no"> <div class="broadcast_details_img_no">
<image :src="item.product.image" /> <image :src="item.product.image" />
</div> </div>
<div class="broadcast_details_picBox_no noPad"> <div class="broadcast_details_picBox_no noPad"
v-if="isWholeSale == 0 || isWholeSale == 2">
<div class="broadcast_details_pic"> <div class="broadcast_details_pic">
￥{{ item.product.price }} ￥{{ item.product.price }}
</div> </div>
@ -119,6 +120,17 @@
{{item.product.store_name}} {{item.product.store_name}}
</div> </div>
</div> </div>
<div class="broadcast_details_picBox_no noPad"
v-if="isWholeSale == 1 || isWholeSale == 2">
<div class="broadcast_details_pic">
￥{{ item.product.wholesale_price }}
</div>
<div class="broadcast_details_tit_no line1">
{{item.product.store_name}}
</div>
</div>
</navigator> </navigator>
</div> </div>
</div> </div>
@ -959,7 +971,8 @@
httpUrl: '', httpUrl: '',
press: false, press: false,
index: 0, index: 0,
j: 0 j: 0,
isWholeSale: ''
}; };
}, },
watch: { watch: {
@ -1008,6 +1021,9 @@
}); });
}); });
// #endif // #endif
this.isWholeSale = this.$store.state.app.userInfo?.mer_info?.wholesale
console.log(this.isWholeSale);
}, },
onReady() { onReady() {
this.httpUrl = `${HTTP_REQUEST_URL}/static/look.png`; this.httpUrl = `${HTTP_REQUEST_URL}/static/look.png`;

5
pages/chat/customer_list/index.vue
View File

@ -92,12 +92,15 @@
clear: false, clear: false,
isAuto: false, //没有授权的不会自动授权 isAuto: false, //没有授权的不会自动授权
isShowAuth: false, //是否隐藏授权 isShowAuth: false, //是否隐藏授权
isWholeSale: ''
}; };
}, },
computed: mapGetters(['isLogin', 'viewColor']), computed: mapGetters(['isLogin', 'viewColor']),
onLoad(optios) { onLoad(optios) {
this.type = optios.type || 1; this.type = optios.type || 1;
this.getindex() this.getindex();
this.isWholeSale = this.$store.state.app.userInfo?.mer_info?.wholesale
console.log(this.isWholeSale);
}, },
onShow(option) { onShow(option) {
if (this.isLogin) { if (this.isLogin) {

11
pages/goods_details/index.vue
View File

@ -51,7 +51,10 @@
<view v-else class='share acea-row row-between row-bottom'> <view v-else class='share acea-row row-between row-bottom'>
<view class='money p-color skeleton-rect' style="min-width: 70rpx;"> <view class='money p-color skeleton-rect' style="min-width: 70rpx;">
￥ ￥
<text class='num'>{{storeInfo.price}}</text> <text class='num'
v-if="isWholeSale == 0 || isWholeSale == 2">{{storeInfo.price}}</text>
<text class='num'
v-if="isWholeSale == 1 || isWholeSale == 2">{{storeInfo.wholesale_price}}</text>
<view v-if="svipData && svipData.show_svip_price && svipData.show_svip" <view v-if="svipData && svipData.show_svip_price && svipData.show_svip"
style="display: inline-block;"> style="display: inline-block;">
<text class="vip-money">￥{{storeInfo.svip_price}}</text> <text class="vip-money">￥{{storeInfo.svip_price}}</text>
@ -619,7 +622,8 @@
params: [] params: []
}, },
product_type: 0, product_type: 0,
referer: '' referer: '',
isWholeSale: ''
}; };
}, },
computed: { computed: {
@ -697,6 +701,9 @@
this.downloadFilePromotionCode(); this.downloadFilePromotionCode();
this.getHistory() this.getHistory()
} }
this.isWholeSale = this.$store.state.app.userInfo?.mer_info?.wholesale
console.log(this.isWholeSale);
}, },
onReady() { onReady() {
this.isNodes++; this.isNodes++;

45
pages/product/addGood/addGood.vue
View File

@ -63,28 +63,31 @@
<u-form-item label="价格与库存" prop="userInfo.name" ref="item1" border-bottom> <u-form-item label="价格与库存" prop="userInfo.name" ref="item1" border-bottom>
</u-form-item> </u-form-item>
<u-form-item label="计量单位" prop="formData.unit_name" ref="item1" border-bottom> <u-form-item label="计量单位" prop="formData.unit_name" ref="item1" border-bottom>
<view style="display: flex;" slot='right' @click='showPouple=true'> <view style="display: flex;align-items: center;" slot='right' @click='showPouple=true'>
<view style="margin-right: 10rpx;line-height: 25rpx;color:#777777"> <view style="margin-right: 10rpx;line-height: 25rpx;color:rgb(119, 119, 119);font-size: 28rpx;">
{{formData.attrValue[0].unit_name ||'请选择'}} {{formData.attrValue[0].unit_name ||'请选择'}}
</view> </view>
<u-icon name="arrow-right" style="margin-right: 30rpx;"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
</u-form-item> </u-form-item>
<u-form-item v-if='isWholeSale' label="批发价格" prop="formData.wholesale_price" ref="item1" border-bottom> <u-form-item v-if='isWholeSale == 2 || isWholeSale == 1' label="批发价格" prop="formData.wholesale_price"
<u--input inputAlign='right' placeholderStyle="color:#777777" style="width: 300rpx;" ref="item1" border-bottom>
placeholder="请输入批发价格" @blur='fixed2(2)' type='number' <u--input inputAlign='right' placeholderStyle="font-size:28rpx;color:rgb(119, 119, 119);"
style="width: 300rpx;" placeholder="请输入批发价格" @blur='fixed2(2)' type='number'
v-model="formData.attrValue[0].wholesale_price" slot='right'></u--input> v-model="formData.attrValue[0].wholesale_price" slot='right'></u--input>
</u-form-item> </u-form-item>
<u-form-item v-else label="零售价格" prop="formData.price" ref="item1" border-bottom> <u-form-item v-if='isWholeSale == 2 || isWholeSale == 0' label="零售价格" prop="formData.price" ref="item1"
<u--input inputAlign='right' placeholderStyle="color:#777777" style="width: 300rpx;" border-bottom>
placeholder="请输入零售价" type='number' @blur='fixed2(1)' v-model="formData.attrValue[0].price" <u--input inputAlign='right' placeholderStyle="font-size:28rpx;color:rgb(119, 119, 119);"
slot='right'></u--input> style="width: 300rpx;" placeholder="请输入零售价格" type='number' @blur='fixed2(1)'
v-model="formData.attrValue[0].price" slot='right'></u--input>
</u-form-item> </u-form-item>
<u-form-item label="商品库存" prop="formData.stock" ref="item1"> <u-form-item label="商品库存" prop="formData.stock" ref="item1">
<u--input inputAlign='right' type='number' placeholderStyle="color:#777777" style="width: 300rpx;" <u--input inputAlign='right' type='number'
placeholderStyle="font-size:28rpx;color:rgb(119, 119, 119);" style="width: 300rpx;"
placeholder="请输入库存" v-model="formData.attrValue[0].stock" slot='right'></u--input> placeholder="请输入库存" v-model="formData.attrValue[0].stock" slot='right'></u--input>
</u-form-item> </u-form-item>
</view> </view>
@ -184,7 +187,7 @@
columns: [ columns: [
['图片', '视频', ] ['图片', '视频', ]
], ],
isWholeSale: false, //批发商 isWholeSale: '', //批发商
show: false, //选择图片还是视屏 show: false, //选择图片还是视屏
showCustom: false, //计量单位自定义 showCustom: false, //计量单位自定义
mer_id: "", mer_id: "",
@ -515,12 +518,15 @@
}, },
onLoad(option) { onLoad(option) {
this.mer_id = option.mer_id this.mer_id = option.mer_id
if (this.$store.state.app.userInfo?.mer_info?.wholesale == 2 || this.$store.state.app.userInfo?.mer_info
?.wholesale == 1) { this.isWholeSale = this.$store.state.app.userInfo?.mer_info?.wholesale;
this.isWholeSale = true;
} else { // if (this.$store.state.app.userInfo?.mer_info?.wholesale == 2 || this.$store.state.app.userInfo?.mer_info
this.isWholeSale = false; // ?.wholesale == 1) {
} // this.isWholeSale = true;
// } else {
// this.isWholeSale = false;
// }
if (option.formData) { if (option.formData) {
this.formData = JSON.parse(option.formData) this.formData = JSON.parse(option.formData)
@ -603,10 +609,11 @@
.goods-leval-li { .goods-leval-li {
margin-right: 20rpx; margin-right: 20rpx;
padding: 10rpx 40rpx; padding: 10rpx 40rpx;
height: 60rpx; /* height: 60rpx; */
margin-bottom: 20rpx; margin-bottom: 20rpx;
border-radius: 36rpx 36rpx 36rpx 36rpx; border-radius: 36rpx 36rpx 36rpx 36rpx;
background-color: #F1F1F1; background-color: #F1F1F1;
word-break: break-word;
} }
.act { .act {

40
pages/product/addGoodDetail/addGoodDetail.vue
View File

@ -148,14 +148,15 @@
<view class="" v-if="showSet"> <view class="" v-if="showSet">
<view class="" v-for="(item,index) in formData.attrValue.filter(item=> item.is_use==0)"> <view class="" v-for="(item,index) in formData.attrValue.filter(item=> item.is_use==0)">
<view class="" v-if='formData.attrValue.filter(item=> item.is_use==0).length==1'> <view class="" v-if='formData.attrValue.filter(item=> item.is_use==0).length==1'>
<u-form-item v-if='isWholeSale' label="批发价格" label-width="auto" labelPosition="left" <u-form-item v-if='isWholeSale == 2 || isWholeSale == 1' label="批发价格" label-width="auto"
border-bottom> labelPosition="left" border-bottom>
<view style="font-size: 28rpx;color:#777777 ;width: 100%;text-align: right;"> <view style="font-size: 28rpx;color:#777777 ;width: 100%;text-align: right;">
{{item.wholesale_price}}元/{{item.wholesale_unit_name}} {{item.wholesale_price}}元/{{item.wholesale_unit_name}}
</view> </view>
</u-form-item> </u-form-item>
<u-form-item v-else label="零售价格" label-width="auto" labelPosition="left" border-bottom> <u-form-item v-if='isWholeSale == 2 || isWholeSale == 0' label="零售价格" label-width="auto"
labelPosition="left" border-bottom>
<view style="font-size: 28rpx;color:#777777 ;width: 100%;text-align: right;"> <view style="font-size: 28rpx;color:#777777 ;width: 100%;text-align: right;">
{{item.price}}元/{{item.unit_name}} {{item.price}}元/{{item.unit_name}}
</view> </view>
@ -169,7 +170,7 @@
</view> </view>
<view class="" v-else> <view class="" v-else>
<u-form-item :label="item.sku" label-width="350rpx" prop="userInfo.name" ref="item1" <u-form-item :label="item.sku" label-width="350rpx" prop="userInfo.name" ref="item1"
labelPosition="left" border-bottom> labelPosition="left" border-bottom v-if='isWholeSale == 2 || isWholeSale == 0'>
<view class="" style="display: flex;justify-content: space-between;width: 100%"> <view class="" style="display: flex;justify-content: space-between;width: 100%">
<view style="font-size: 28rpx;color:#777777 ;"> <view style="font-size: 28rpx;color:#777777 ;">
零售价 零售价
@ -179,8 +180,9 @@
</view> </view>
</view> </view>
</u-form-item> </u-form-item>
<u-form-item label=" " label-width="350rpx" prop="userInfo.name" ref="item1" <u-form-item label=" " label-width="350rpx" prop="userInfo.name" ref="item1"
labelPosition="left" border-bottom v-if='isWholeSale'> labelPosition="left" border-bottom v-if='isWholeSale == 2 || isWholeSale == 1'>
<view class="" style="display: flex;justify-content: space-between;width: 100%"> <view class="" style="display: flex;justify-content: space-between;width: 100%">
<view style="font-size: 28rpx;color:#777777 ;"> <view style="font-size: 28rpx;color:#777777 ;">
批发价 批发价
@ -312,7 +314,7 @@
show: false, //选择图片还是视屏 show: false, //选择图片还是视屏
showSet: false, showSet: false,
delivery_way: [], delivery_way: [],
isWholeSale: false, isWholeSale: '',
formData: { formData: {
store_info: "", store_info: "",
product_id: "", product_id: "",
@ -493,7 +495,6 @@
uni.previewImage({ uni.previewImage({
urls: [url], urls: [url],
}); });
}, },
deleteImage(index) { deleteImage(index) {
// this.addGoodsSecoundData.video_link = ''; // this.addGoodsSecoundData.video_link = '';
@ -525,7 +526,6 @@
this.uploadVideo() this.uploadVideo()
} }
}, },
// 选择图片 // 选择图片
@ -543,9 +543,7 @@
that.$set(that.formData.imageList, that.formData.imageList.length, res.data.path.replace( that.$set(that.formData.imageList, that.formData.imageList.length, res.data.path.replace(
/\\/g, /\\/g,
"")); ""));
} }
// that.formData.imageList.push(res.data.path); // that.formData.imageList.push(res.data.path);
}); });
}, },
@ -717,11 +715,13 @@
async initFormData(option) { async initFormData(option) {
if (this.$store.state.app.userInfo?.mer_info?.wholesale == 0) { // if (this.$store.state.app.userInfo?.mer_info?.wholesale == 0) {
this.isWholeSale = false; // this.isWholeSale = false;
} else { // } else {
this.isWholeSale = true; // this.isWholeSale = true;
} // }
this.isWholeSale = this.$store.state.app.userInfo?.mer_info?.wholesale;
this.mer_id = option.mer_id this.mer_id = option.mer_id
if (option.formData) { if (option.formData) {
@ -742,7 +742,6 @@
} }
}, },
onLoad(option) { onLoad(option) {
this.initFormData(option) this.initFormData(option)
this.showSet = option.showSet ? JSON.parse(option.showSet) : this.showSet this.showSet = option.showSet ? JSON.parse(option.showSet) : this.showSet
@ -781,7 +780,6 @@
} }
}) })
} }
}, },
onBackPress: function(e) { onBackPress: function(e) {
this.showlay = true this.showlay = true
@ -799,7 +797,6 @@
padding-bottom: 280rpx; padding-bottom: 280rpx;
padding: 20rpx 20rpx 200rpx 20rpx; padding: 20rpx 20rpx 200rpx 20rpx;
.card { .card {
background-color: white; background-color: white;
padding: 28rpx 30rpx; padding: 28rpx 30rpx;
@ -819,11 +816,8 @@
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx 0; padding: 20rpx 0;
overflow: hidden; overflow: hidden;
} }
.tips { .tips {
color: #777777; color: #777777;
font-size: 28rpx; font-size: 28rpx;
@ -860,7 +854,6 @@
padding: 70rpx 0 40rpx 0; padding: 70rpx 0 40rpx 0;
} }
.jiao { .jiao {
image { image {
position: absolute; position: absolute;
@ -882,7 +875,6 @@
.preview_video { .preview_video {
position: absolute; position: absolute;
background-color: red; background-color: red;
} }
.content_list_video { .content_list_video {
@ -894,7 +886,6 @@
.content_list_video_title { .content_list_video_title {
/* padding-top: 10rpx; */ /* padding-top: 10rpx; */
} }
} }
.video-count { .video-count {
@ -921,7 +912,6 @@
font-size: 24rpx; font-size: 24rpx;
text-align: center; text-align: center;
/* position: absolute; */ /* position: absolute; */
} }
.image-play-icon { .image-play-icon {

38
pages/product/addGoodDetail/goodsPrice.vue
View File

@ -13,22 +13,24 @@
<u-line direction="row" style="margin: 30rpx 0;" color="#ECECEC"></u-line> <u-line direction="row" style="margin: 30rpx 0;" color="#ECECEC"></u-line>
<view class=""> <view class="">
<view class="" v-if='isWholeSale == 1 || isWholeSale == 2'
<view class="" v-if='isWholeSale' style="display: flex;align-items: center;justify-content: space-between;margin-top: 30rpx;margin-bottom: 20rpx;">
style="display: flex;align-items: center;justify-content: space-between;margin-top: 30rpx;"> <u--input style="flex: 2; background-color: #F6F6F6;" placeholder="请输入批发价格"
<u--input style="flex: 2; background-color: #F6F6F6;" placeholder="请输批发价格" placeholderStyle="font-size:26rpx;color:rgb(192, 196, 204);" v-model="item.wholesale_price"
v-model="item.wholesale_price" type='number'></u--input> type='number'></u--input>
<view class="" style="flex: 1;text-align: center;"> <view class="" style="flex: 1;text-align: center;">
/ /
</view> </view>
<view class="" @click="unitIptClick(index,true)" style="width: 100rpx;flex: 2.4"> <view class="" @click="unitIptClick(index,true)" style="width: 100rpx;flex: 2.4">
<u--input style="background-color: #F6F6F6;pointer-events: none;" readonly placeholder="请输入计量单位" <u--input style="background-color: #F6F6F6;pointer-events: none;" readonly placeholder="请输入计量单位"
placeholderStyle="font-size:26rpx;color:rgb(192, 196, 204);"
v-model="item.wholesale_unit_name"></u--input> v-model="item.wholesale_unit_name"></u--input>
</view> </view>
</view> </view>
<view v-else class="" style="display: flex;align-items: center;justify-content: space-between;"> <view v-if='isWholeSale == 0 || isWholeSale == 2' class=""
<u--input style="flex: 2; background-color: #F6F6F6;" placeholder="请输入商品单价" v-model="item.price" style="display: flex;align-items: center;justify-content: space-between;">
<u--input style="flex: 2; background-color: #F6F6F6;" placeholder="请输入零售价格" v-model="item.price"
placeholderStyle="font-size:26rpx;color:rgb(192, 196, 204);" type='number'></u--input> placeholderStyle="font-size:26rpx;color:rgb(192, 196, 204);" type='number'></u--input>
<view class="" style="flex: 1;text-align: center;"> <view class="" style="flex: 1;text-align: center;">
/ /
@ -171,7 +173,6 @@
wholesale_price: '批发价格不能为空', wholesale_price: '批发价格不能为空',
wholesale_unit_name: '批发单位不能为空', wholesale_unit_name: '批发单位不能为空',
stock: '库存不能为空', stock: '库存不能为空',
} }
} }
}, },
@ -255,10 +256,19 @@
submit() { submit() {
// 校验 // 校验
let errList = [] let errList = []
if (!this.isWholeSale) { // if (!this.isWholeSale) {
// delete this.rules.wholesale_unit_name
// delete this.rules.wholesale_price
// }
if (this.isWholeSale == 0) { //零售
delete this.rules.wholesale_unit_name delete this.rules.wholesale_unit_name
delete this.rules.wholesale_price delete this.rules.wholesale_price
} else if (this.isWholeSale == 1) { //批发
delete this.rules.price;
delete this.rules.unit_name;
} }
this.attrValue.forEach(item => { this.attrValue.forEach(item => {
for (let key in this.rules) { for (let key in this.rules) {
if (!item[key]) { if (!item[key]) {
@ -313,12 +323,7 @@
} }
}, },
onLoad(option) { onLoad(option) {
if (this.$store.state.app.userInfo?.mer_info?.wholesale == 2 || this.$store.state.app.userInfo?.mer_info this.isWholeSale = this.$store.state.app.userInfo?.mer_info?.wholesale
?.wholesale == 1) {
this.isWholeSale = true;
} else {
this.isWholeSale = false;
}
this.initFomrData(option) this.initFomrData(option)
this.attrValue = this.formData.attrValue this.attrValue = this.formData.attrValue
this.attrValue.forEach(item => { this.attrValue.forEach(item => {
@ -402,10 +407,11 @@
.goods-leval-li { .goods-leval-li {
margin-right: 20rpx; margin-right: 20rpx;
padding: 10rpx 40rpx; padding: 10rpx 40rpx;
height: 60rpx; /* height: 60rpx; */
margin-bottom: 20rpx; margin-bottom: 20rpx;
border-radius: 36rpx 36rpx 36rpx 36rpx; border-radius: 36rpx 36rpx 36rpx 36rpx;
background-color: #F1F1F1; background-color: #F1F1F1;
word-break: break-word;
} }
.act { .act {

4
pages/product/basicSet.vue
View File

@ -309,8 +309,6 @@
merchantInfoAPI({ merchantInfoAPI({
id id
}).then(res => { }).then(res => {
console.log(res)
this.mer_name = res.data.mer_name this.mer_name = res.data.mer_name
this.category_name = res.data.merchantCategory.category_name this.category_name = res.data.merchantCategory.category_name
// this.images[0].img = res.data.mer_banner // this.images[0].img = res.data.mer_banner
@ -360,7 +358,7 @@
this.cruxText = res.data.mer_keyword this.cruxText = res.data.mer_keyword
if (!res.data.mer_address) { if (!res.data.mer_address) {
this.selfLocation(); // this.selfLocation();
} else { } else {
this.mer_address = res.data.mer_address; this.mer_address = res.data.mer_address;
} }