diff --git a/api/supplier.js b/api/supplier.js
index ffb76f8..65b38d3 100644
--- a/api/supplier.js
+++ b/api/supplier.js
@@ -74,4 +74,14 @@ export const UserWithdrawListsdate_listsApi = (data) => {
// 余额明细
export const UserBlancelistsApi = (data) => {
return request.get('financial/FinancialRecord/supplier_list', data);
+}
+
+// 发货
+export const OpurchaseclassExpressApi = (data) => {
+ return request.post('operation/Opurchaseclass/express', data);
+}
+
+// 物流公司列表
+export const ExpressListApi = (data) => {
+ return request.get('index/express_list', data);
}
\ No newline at end of file
diff --git a/config/app.js b/config/app.js
index 182cfb1..4daa89a 100644
--- a/config/app.js
+++ b/config/app.js
@@ -30,7 +30,7 @@ switch (env) {
httpApi = 'https://test.shop.lihaink.cn' //预发布环境
httpSix = 'https://ceshi-new-wokr.lihaink.cn'
// httpTwo = 'https://erp.lihaink.cn'
- httpTwo = 'http://192.168.1.13:8546'
+ httpTwo = 'http://192.168.1.22:8546'
wsApi = 'wss://test.shop.lihaink.cn'
break;
default:
diff --git a/manifest.json b/manifest.json
index 953d255..92d1400 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,353 +1,353 @@
{
- "name": "惠农生活",
- "appid": "__UNI__3A527D1",
- "description": "",
- "versionName": "2.0.57",
- "versionCode": 2057,
- "transformPx": false,
- /* 5+App特有相关 */
- "app-plus": {
- "titleNView": true,
- "usingComponents": true,
- "nvueCompiler": "uni-app",
- "nvueStyleCompiler": "uni-app",
- "compilerVersion": 3,
- "compatible": {
- "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
- },
- "splashscreen": {
- "alwaysShowBeforeRender": false,
- "waiting": false,
- "autoclose": true,
- "delay": 0
- },
- /* 模块配置 */
- "modules": {
- "VideoPlayer": {},
- "OAuth": {},
- "Payment": {},
- "Share": {},
- "iBeacon": {},
- "Maps": {},
- "Geolocation": {},
- "UniMP": {
- "description": "uni小程序"
- },
- "Push": {},
- "Barcode": {},
- "Camera": {}
- },
- "safearea": {
- "bottom": {
- "offset": "none"
- }
- },
- /* 应用发布信息 */
- "distribute": {
- /* android打包配置 */
- "android": {
- "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_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.BLUETOOTH\"/>",
- "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
- "<uses-permission android:name=\"android.permission.CAMERA\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
- "<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.WAKE_LOCK\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
- "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
- ],
- "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
- "permissionExternalStorage": {
- "request": "none",
- "prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
- },
- "permissionPhoneState": {
- "request": "none" //拨打电话权限关闭
- },
- "minSdkVersion": 23,
- "targetSdkVersion": 30
- },
- /* ios打包配置 */
- "ios": {
- "privacyDescription": {
- "NSPhotoLibraryUsageDescription": "上传用户头像保存分享海报",
- "NSPhotoLibraryAddUsageDescription": "上传用户头像保存分享海报",
- "NSCameraUsageDescription": "上传用户头像保存分享海报",
- "NSLocationWhenInUseUsageDescription": "根据客户地理位置推荐最近门店",
- "NSLocationAlwaysUsageDescription": "根据客户地理位置推荐最近门店"
- },
- "idfa": false,
- "dSYMs": false
- },
- /* SDK配置 */
- "sdkConfigs": {
- "maps": {
- "amap": {
- "appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
- "appkey_android": "0354f5ddc11e2ea76c5aac647f44d945",
- "name": "amapIvoVHpJR"
- }
- },
- "payment": {
- "weixin": {
- "__platform__": ["ios", "android"],
- "appid": "wx2e8f79ff281284f5",
- "UniversalLinks": "https://shop.lihaink.cn/"
- }
- },
- "share": {
- "weixin": {
- "appid": "wx2e8f79ff281284f5",
- "UniversalLinks": "https://shop.lihaink.cn/"
- }
- },
- "geolocation": {
- "amap": {
- "name": "amapIvoVHpJR",
- "__platform__": ["ios", "android"],
- "appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
- "appkey_android": "0354f5ddc11e2ea76c5aac647f44d945"
- }
- },
- "push": {},
- "oauth": {
- "weixin": {
- "appid": "wx2e8f79ff281284f5",
- "UniversalLinks": "https://shop.lihaink.cn/"
- },
- "univerify": {}
- },
- "ad": {}
- },
- "icons": {
- "android": {
- "hdpi": "unpackage/res/icons/72x72.png",
- "xhdpi": "unpackage/res/icons/96x96.png",
- "xxhdpi": "unpackage/res/icons/144x144.png",
- "xxxhdpi": "unpackage/res/icons/192x192.png"
- },
- "ios": {
- "appstore": "unpackage/res/icons/1024x1024.png",
- "ipad": {
- "app": "unpackage/res/icons/76x76.png",
- "app@2x": "unpackage/res/icons/152x152.png",
- "notification": "unpackage/res/icons/20x20.png",
- "notification@2x": "unpackage/res/icons/40x40.png",
- "proapp@2x": "unpackage/res/icons/167x167.png",
- "settings": "unpackage/res/icons/29x29.png",
- "settings@2x": "unpackage/res/icons/58x58.png",
- "spotlight": "unpackage/res/icons/40x40.png",
- "spotlight@2x": "unpackage/res/icons/80x80.png"
- },
- "iphone": {
- "app@2x": "unpackage/res/icons/120x120.png",
- "app@3x": "unpackage/res/icons/180x180.png",
- "notification@2x": "unpackage/res/icons/40x40.png",
- "notification@3x": "unpackage/res/icons/60x60.png",
- "settings@2x": "unpackage/res/icons/58x58.png",
- "settings@3x": "unpackage/res/icons/87x87.png",
- "spotlight@2x": "unpackage/res/icons/80x80.png",
- "spotlight@3x": "unpackage/res/icons/120x120.png"
- }
- }
- },
- "splashscreen": {
- "useOriginalMsgbox": true,
- "androidStyle": "common"
- }
- },
- "nativePlugins": {
- "JG-JCore": {
- "JPUSH_APPKEY_IOS": "8a5efd65cda14fafa6e64ad3",
- "JPUSH_CHANNEL_IOS": "8a5efd65cda14fafa6e64ad3",
- "JPUSH_APPKEY_ANDROID": "b5f679f4357018605ea6fd2e",
- "JPUSH_CHANNEL_ANDROID": "",
- "__plugin_info__": {
- "name": "JG-JCore",
- "description": "极光推送JCore插件",
- "platforms": "Android,iOS",
- "url": "",
- "android_package_name": "uni.UNI3A527D1",
- "ios_bundle_id": "",
- "isCloud": false,
- "bought": -1,
- "pid": "",
- "parameters": {
- "JPUSH_APPKEY_IOS": {
- "des": "[iOS]极光portal配置应用信息时分配的AppKey",
- "key": "JCore:APP_KEY",
- "value": "daebe19b547c43128796a078"
- },
- "JPUSH_CHANNEL_IOS": {
- "des": "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
- "key": "JCore:CHANNEL",
- "value": ""
- },
- "JPUSH_APPKEY_ANDROID": {
- "des": "[Android]极光portal配置应用信息时分配的AppKey",
- "key": "JPUSH_APPKEY",
- "value": ""
- },
- "JPUSH_CHANNEL_ANDROID": {
- "des": "[Android]用于统计分发渠道，不需要可填默认值developer-default",
- "key": "JPUSH_CHANNEL",
- "value": ""
- }
- }
- }
- },
- "JG-JPush": {
- "JPUSH_ISPRODUCTION_IOS": "true",
- "JPUSH_ADVERTISINGID_IOS": "",
- "JPUSH_DEFAULTINITJPUSH_IOS": "true",
- "JPUSH_OPPO_APPKEY": "",
- "JPUSH_OPPO_APPID": "",
- "JPUSH_OPPO_APPSECRET": "",
- "JPUSH_VIVO_APPKEY": "",
- "JPUSH_VIVO_APPID": "",
- "JPUSH_MEIZU_APPKEY": "",
- "JPUSH_MEIZU_APPID": "",
- "JPUSH_XIAOMI_APPKEY": "",
- "JPUSH_XIAOMI_APPID": "",
- "__plugin_info__": {
- "name": "JG-JPush",
- "description": "极光推送Hbuilder插件",
- "platforms": "Android,iOS",
- "url": "",
- "android_package_name": "uni.UNI3A527D1",
- "ios_bundle_id": "",
- "isCloud": false,
- "bought": -1,
- "pid": "",
- "parameters": {
- "JPUSH_ISPRODUCTION_IOS": {
- "des": "[iOS]是否是生产环境，是填true，不是填false或者不填",
- "key": "JPush:ISPRODUCTION",
- "value": ""
- },
- "JPUSH_ADVERTISINGID_IOS": {
- "des": "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
- "key": "JPush:ADVERTISINGID",
- "value": ""
- },
- "JPUSH_DEFAULTINITJPUSH_IOS": {
- "des": "[iOS]是否默认初始化，是填true，不是填false或者不填",
- "key": "JPush:DEFAULTINITJPUSH",
- "value": ""
- },
- "JPUSH_OPPO_APPKEY": {
- "des": "厂商OPPO-appkey,示例：OP-12345678",
- "key": "OPPO_APPKEY",
- "value": ""
- },
- "JPUSH_OPPO_APPID": {
- "des": "厂商OPPO-appId,示例：OP-12345678",
- "key": "OPPO_APPID",
- "value": ""
- },
- "JPUSH_OPPO_APPSECRET": {
- "des": "厂商OPPO-appSecret,示例：OP-12345678",
- "key": "OPPO_APPSECRET",
- "value": ""
- },
- "JPUSH_VIVO_APPKEY": {
- "des": "厂商VIVO-appkey,示例：12345678",
- "key": "com.vivo.push.api_key",
- "value": ""
- },
- "JPUSH_VIVO_APPID": {
- "des": "厂商VIVO-appId,示例：12345678",
- "key": "com.vivo.push.app_id",
- "value": ""
- },
- "JPUSH_MEIZU_APPKEY": {
- "des": "厂商MEIZU-appKey,示例：MZ-12345678",
- "key": "MEIZU_APPKEY",
- "value": ""
- },
- "JPUSH_MEIZU_APPID": {
- "des": "厂商MEIZU-appId,示例：MZ-12345678",
- "key": "MEIZU_APPID",
- "value": ""
- },
- "JPUSH_XIAOMI_APPKEY": {
- "des": "厂商XIAOMI-appKey,示例：MI-12345678",
- "key": "XIAOMI_APPKEY",
- "value": ""
- },
- "JPUSH_XIAOMI_APPID": {
- "des": "厂商XIAOMI-appId,示例：MI-12345678",
- "key": "XIAOMI_APPID",
- "value": ""
- }
- }
- }
- }
- }
- },
- /* 快应用特有相关 */
- "quickapp": {},
- /* 小程序特有相关 */
- "mp-weixin": {
- "appid": "wx5fb1cc8edb3f8baa",
- "setting": {
- "urlCheck": false,
- "minified": true,
- "postcss": true,
- "es6": true
- },
- "permission": {
- "scope.userLocation": {
- "desc": "获取您的位置"
- }
- },
- "requiredPrivateInfos": ["getLocation", "chooseAddress"],
- "usingComponents": true,
- "__usePrivacyCheck__": true
- },
- "mp-alipay": {
- "usingComponents": true
- },
- "mp-baidu": {
- "usingComponents": true
- },
- "mp-toutiao": {
- "usingComponents": true
- },
- "h5": {
- "devServer": {
- "https": false
- },
- "router": {
- "mode": "history",
- "base": ""
- },
- "domain": "",
- "sdkConfigs": {
- "maps": {
- "qqmap": {
- "key": "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
- }
- }
- },
- "title": "加载中...",
- "template": "template.h5.html",
- "optimization": {
- "treeShaking": {
- "enable": true
- }
- }
- }
-}
\ No newline at end of file
+ "name" : "惠农生活",
+ "appid" : "__UNI__3A527D1",
+ "description" : "",
+ "versionName" : "2.0.58",
+ "versionCode" : 2058,
+ "transformPx" : false,
+ /* 5+App特有相关 */
+ "app-plus" : {
+ "titleNView" : true,
+ "usingComponents" : true,
+ "nvueCompiler" : "uni-app",
+ "nvueStyleCompiler" : "uni-app",
+ "compilerVersion" : 3,
+ "compatible" : {
+ "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
+ },
+ "splashscreen" : {
+ "alwaysShowBeforeRender" : false,
+ "waiting" : false,
+ "autoclose" : true,
+ "delay" : 0
+ },
+ /* 模块配置 */
+ "modules" : {
+ "VideoPlayer" : {},
+ "OAuth" : {},
+ "Payment" : {},
+ "Share" : {},
+ "iBeacon" : {},
+ "Maps" : {},
+ "Geolocation" : {},
+ "UniMP" : {
+ "description" : "uni小程序"
+ },
+ "Push" : {},
+ "Barcode" : {},
+ "Camera" : {}
+ },
+ "safearea" : {
+ "bottom" : {
+ "offset" : "none"
+ }
+ },
+ /* 应用发布信息 */
+ "distribute" : {
+ /* android打包配置 */
+ "android" : {
+ "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_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.BLUETOOTH\"/>",
+ "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+ "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
+ "<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.WAKE_LOCK\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+ "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
+ ],
+ "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+ "permissionExternalStorage" : {
+ "request" : "none",
+ "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+ },
+ "permissionPhoneState" : {
+ "request" : "none" //拨打电话权限关闭
+ },
+ "minSdkVersion" : 23,
+ "targetSdkVersion" : 30
+ },
+ /* ios打包配置 */
+ "ios" : {
+ "privacyDescription" : {
+ "NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报",
+ "NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报",
+ "NSCameraUsageDescription" : "上传用户头像保存分享海报",
+ "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
+ "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
+ },
+ "idfa" : false,
+ "dSYMs" : false
+ },
+ /* SDK配置 */
+ "sdkConfigs" : {
+ "maps" : {
+ "amap" : {
+ "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
+ "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945",
+ "name" : "amapIvoVHpJR"
+ }
+ },
+ "payment" : {
+ "weixin" : {
+ "__platform__" : [ "ios", "android" ],
+ "appid" : "wx2e8f79ff281284f5",
+ "UniversalLinks" : "https://shop.lihaink.cn/"
+ }
+ },
+ "share" : {
+ "weixin" : {
+ "appid" : "wx2e8f79ff281284f5",
+ "UniversalLinks" : "https://shop.lihaink.cn/"
+ }
+ },
+ "geolocation" : {
+ "amap" : {
+ "name" : "amapIvoVHpJR",
+ "__platform__" : [ "ios", "android" ],
+ "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
+ "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945"
+ }
+ },
+ "push" : {},
+ "oauth" : {
+ "weixin" : {
+ "appid" : "wx2e8f79ff281284f5",
+ "UniversalLinks" : "https://shop.lihaink.cn/"
+ },
+ "univerify" : {}
+ },
+ "ad" : {}
+ },
+ "icons" : {
+ "android" : {
+ "hdpi" : "unpackage/res/icons/72x72.png",
+ "xhdpi" : "unpackage/res/icons/96x96.png",
+ "xxhdpi" : "unpackage/res/icons/144x144.png",
+ "xxxhdpi" : "unpackage/res/icons/192x192.png"
+ },
+ "ios" : {
+ "appstore" : "unpackage/res/icons/1024x1024.png",
+ "ipad" : {
+ "app" : "unpackage/res/icons/76x76.png",
+ "app@2x" : "unpackage/res/icons/152x152.png",
+ "notification" : "unpackage/res/icons/20x20.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "proapp@2x" : "unpackage/res/icons/167x167.png",
+ "settings" : "unpackage/res/icons/29x29.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "spotlight" : "unpackage/res/icons/40x40.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png"
+ },
+ "iphone" : {
+ "app@2x" : "unpackage/res/icons/120x120.png",
+ "app@3x" : "unpackage/res/icons/180x180.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "notification@3x" : "unpackage/res/icons/60x60.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "settings@3x" : "unpackage/res/icons/87x87.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png",
+ "spotlight@3x" : "unpackage/res/icons/120x120.png"
+ }
+ }
+ },
+ "splashscreen" : {
+ "useOriginalMsgbox" : true,
+ "androidStyle" : "common"
+ }
+ },
+ "nativePlugins" : {
+ "JG-JCore" : {
+ "JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
+ "JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3",
+ "JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
+ "JPUSH_CHANNEL_ANDROID" : "",
+ "__plugin_info__" : {
+ "name" : "JG-JCore",
+ "description" : "极光推送JCore插件",
+ "platforms" : "Android,iOS",
+ "url" : "",
+ "android_package_name" : "uni.UNI3A527D1",
+ "ios_bundle_id" : "",
+ "isCloud" : false,
+ "bought" : -1,
+ "pid" : "",
+ "parameters" : {
+ "JPUSH_APPKEY_IOS" : {
+ "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
+ "key" : "JCore:APP_KEY",
+ "value" : "daebe19b547c43128796a078"
+ },
+ "JPUSH_CHANNEL_IOS" : {
+ "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
+ "key" : "JCore:CHANNEL",
+ "value" : ""
+ },
+ "JPUSH_APPKEY_ANDROID" : {
+ "des" : "[Android]极光portal配置应用信息时分配的AppKey",
+ "key" : "JPUSH_APPKEY",
+ "value" : ""
+ },
+ "JPUSH_CHANNEL_ANDROID" : {
+ "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
+ "key" : "JPUSH_CHANNEL",
+ "value" : ""
+ }
+ }
+ }
+ },
+ "JG-JPush" : {
+ "JPUSH_ISPRODUCTION_IOS" : "true",
+ "JPUSH_ADVERTISINGID_IOS" : "",
+ "JPUSH_DEFAULTINITJPUSH_IOS" : "true",
+ "JPUSH_OPPO_APPKEY" : "",
+ "JPUSH_OPPO_APPID" : "",
+ "JPUSH_OPPO_APPSECRET" : "",
+ "JPUSH_VIVO_APPKEY" : "",
+ "JPUSH_VIVO_APPID" : "",
+ "JPUSH_MEIZU_APPKEY" : "",
+ "JPUSH_MEIZU_APPID" : "",
+ "JPUSH_XIAOMI_APPKEY" : "",
+ "JPUSH_XIAOMI_APPID" : "",
+ "__plugin_info__" : {
+ "name" : "JG-JPush",
+ "description" : "极光推送Hbuilder插件",
+ "platforms" : "Android,iOS",
+ "url" : "",
+ "android_package_name" : "uni.UNI3A527D1",
+ "ios_bundle_id" : "",
+ "isCloud" : false,
+ "bought" : -1,
+ "pid" : "",
+ "parameters" : {
+ "JPUSH_ISPRODUCTION_IOS" : {
+ "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
+ "key" : "JPush:ISPRODUCTION",
+ "value" : ""
+ },
+ "JPUSH_ADVERTISINGID_IOS" : {
+ "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
+ "key" : "JPush:ADVERTISINGID",
+ "value" : ""
+ },
+ "JPUSH_DEFAULTINITJPUSH_IOS" : {
+ "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
+ "key" : "JPush:DEFAULTINITJPUSH",
+ "value" : ""
+ },
+ "JPUSH_OPPO_APPKEY" : {
+ "des" : "厂商OPPO-appkey,示例：OP-12345678",
+ "key" : "OPPO_APPKEY",
+ "value" : ""
+ },
+ "JPUSH_OPPO_APPID" : {
+ "des" : "厂商OPPO-appId,示例：OP-12345678",
+ "key" : "OPPO_APPID",
+ "value" : ""
+ },
+ "JPUSH_OPPO_APPSECRET" : {
+ "des" : "厂商OPPO-appSecret,示例：OP-12345678",
+ "key" : "OPPO_APPSECRET",
+ "value" : ""
+ },
+ "JPUSH_VIVO_APPKEY" : {
+ "des" : "厂商VIVO-appkey,示例：12345678",
+ "key" : "com.vivo.push.api_key",
+ "value" : ""
+ },
+ "JPUSH_VIVO_APPID" : {
+ "des" : "厂商VIVO-appId,示例：12345678",
+ "key" : "com.vivo.push.app_id",
+ "value" : ""
+ },
+ "JPUSH_MEIZU_APPKEY" : {
+ "des" : "厂商MEIZU-appKey,示例：MZ-12345678",
+ "key" : "MEIZU_APPKEY",
+ "value" : ""
+ },
+ "JPUSH_MEIZU_APPID" : {
+ "des" : "厂商MEIZU-appId,示例：MZ-12345678",
+ "key" : "MEIZU_APPID",
+ "value" : ""
+ },
+ "JPUSH_XIAOMI_APPKEY" : {
+ "des" : "厂商XIAOMI-appKey,示例：MI-12345678",
+ "key" : "XIAOMI_APPKEY",
+ "value" : ""
+ },
+ "JPUSH_XIAOMI_APPID" : {
+ "des" : "厂商XIAOMI-appId,示例：MI-12345678",
+ "key" : "XIAOMI_APPID",
+ "value" : ""
+ }
+ }
+ }
+ }
+ }
+ },
+ /* 快应用特有相关 */
+ "quickapp" : {},
+ /* 小程序特有相关 */
+ "mp-weixin" : {
+ "appid" : "wx5fb1cc8edb3f8baa",
+ "setting" : {
+ "urlCheck" : false,
+ "minified" : true,
+ "postcss" : true,
+ "es6" : true
+ },
+ "permission" : {
+ "scope.userLocation" : {
+ "desc" : "获取您的位置"
+ }
+ },
+ "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
+ "usingComponents" : true,
+ "__usePrivacyCheck__" : true
+ },
+ "mp-alipay" : {
+ "usingComponents" : true
+ },
+ "mp-baidu" : {
+ "usingComponents" : true
+ },
+ "mp-toutiao" : {
+ "usingComponents" : true
+ },
+ "h5" : {
+ "devServer" : {
+ "https" : false
+ },
+ "router" : {
+ "mode" : "history",
+ "base" : ""
+ },
+ "domain" : "",
+ "sdkConfigs" : {
+ "maps" : {
+ "qqmap" : {
+ "key" : "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
+ }
+ }
+ },
+ "title" : "加载中...",
+ "template" : "template.h5.html",
+ "optimization" : {
+ "treeShaking" : {
+ "enable" : true
+ }
+ }
+ }
+}
diff --git a/pages/quote/index.vue b/pages/quote/index.vue
index df3e23b..ccc724a 100644
--- a/pages/quote/index.vue
+++ b/pages/quote/index.vue
@@ -1,277 +1,384 @@
<template>
- <view style="padding: 100rpx 0;min-height: 100vh;">
- <view class="head">
- <view class="">
- <view class="" style="display: flex;justify-content: space-around;margin-top: 24rpx;color:#777777">
- <view :class="{act: tabIndex==1}" @click="changeTabs(1)">
- 报价列表
- </view>
- <view :class="{act: tabIndex==2}" @click="changeTabs(2)">
- 报价记录
- </view>
- </view>
- <view style="height: 8rpx;" />
- <view class="line" :style="{left:tabIndex==1?tabsLeft+'px':tabsRight+'px'}" />
- </view>
- </view>
- <view class="content">
- <u-loading-page v-if="loading" :loading="loading"></u-loading-page>
- <view v-else>
- <view class="card" v-for="(item,index) in lists" :key='index'>
- <view class="head">
- </view>
- <view class="card-content">
- <view class="card-content-l" style="width: 152rpx;height: 152rpx;">
- <image style="width: 152rpx;height: 152rpx;" :src="item.goods.imgs" mode=""></image>
- <view class="status">
- {{tabIndex==1?"未报价":"已报价" }}
- </view>
- </view>
- <view class="card-content-r">
- <view class="title ellipsis">
- {{item.goods.goods_name}}
- </view>
- <view class="need">
- 需求量： {{item.need_num}}{{item.goods.unit_name}}
- </view>
- <view class="ipt">
- <u--input placeholder="输入报价数量" :readonly="tabIndex==2" v-model="item.nums"
- style="background-color:#F6F6F6;border: none;"></u--input>
- <view style="width: 10rpx;">
+ <view style="padding: 100rpx 0;min-height: 100vh;">
+ <view class="head">
+ <view class="">
+ <view class="" style="display: flex;justify-content: space-around;margin-top: 24rpx;color:#777777">
+ <view :class="{act: tabIndex==1}" @click="changeTabs(1)">
+ 报价列表
+ </view>
+ <view :class="{act: tabIndex==2}" @click="changeTabs(2)">
+ 报价记录
+ </view>
+ </view>
+ <view style="height: 8rpx;" />
+ <view class="line" :style="{left:tabIndex==1?tabsLeft+'px':tabsRight+'px'}" />
+ </view>
+ </view>
+ <view class="content">
+ <u-loading-page v-if="loading" :loading="loading"></u-loading-page>
+ <view v-else>
+ <view class="card" v-for="(item,index) in lists" :key='index'>
+ <view class="head">
+ </view>
+ <view class="card-content">
+ <view class="card-content-l" style="width: 152rpx;height: 152rpx;">
+ <image style="width: 152rpx;height: 152rpx;" :src="item.goods.imgs" mode=""></image>
+ <view class="status">
+ {{tabIndex==1?"未报价":"已报价" }}
+ </view>
+ </view>
+ <view class="card-content-r">
+ <view class="title ellipsis">
+ {{item.goods.goods_name}}
+ </view>
+ <view class="need">
+ 需求量： {{item.need_num}}{{item.goods.unit_name}}
+ </view>
+ <view class="ipt">
+ <u--input placeholder="输入报价数量" :readonly="tabIndex==2" v-model="item.nums"
+ style="background-color:#F6F6F6;border: none;"></u--input>
+ <view style="width: 10rpx;">
- </view>
- <u--input style="background-color: #F6F6F6;border: none;" placeholder="输入产品报价"
- @blur="priceBlur(index)" :readonly="tabIndex==2" v-model="item.price"></u--input>
- </view>
- </view>
- <view class="status-png" v-if="tabIndex==2">
- <image v-if="item.is_adopt==0" src="/static/images/dbj.png"
- style="width: 108rpx; height: 84rpx;">
- </image>
- <image v-else-if="item.is_adopt==1" src="/static/images/ybj.png"
- style="width: 108rpx; height: 84rpx;">
- </image>
- <image v-else-if="item.is_adopt==2" src="/static/images/ycn.png" style=" width: 108rpx;
- height: 84rpx;">
- </image>
- <image v-else src="/static/images/wcn.png" style="width: 108rpx; height: 84rpx;">
- </image>
- </view>
- </view>
- <view class="card-footer" v-if="item.nums && item.price">
- 共{{item.nums}}{{item.unit_name}} 合计:<text
- style="font-size: 28rpx;color: #FC452F;font-weight: 700;">￥{{(item.nums*item.price).toFixed(2)}}</text>
- </view>
- <u-line style="margin-top: 30rpx;" color="#F3F3F3"></u-line>
- </view>
- <u-empty v-if="lists.length==0" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
- </u-empty>
- </view>
+ </view>
+ <u--input style="background-color: #F6F6F6;border: none;" placeholder="输入产品报价" @blur="priceBlur(index)"
+ :readonly="tabIndex==2" v-model="item.price"></u--input>
+ </view>
+ </view>
+ <view class="status-png" v-if="tabIndex==2">
+ <image v-if="item.is_adopt==0" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/491f6202405281828272606.png" style="width: 108rpx; height: 84rpx;">
+ </image>
+ <image v-else-if="item.is_adopt==1" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/274ad202405111523222891.png" style="width: 108rpx; height: 84rpx;">
+ </image>
+ <image v-else-if="item.is_adopt==2 && item.delivery_name" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/fde75202405281450531427.png" style=" width: 108rpx;
+ height: 84rpx;">
+ </image>
+ <image v-else-if="item.is_adopt==2 && !item.delivery_name" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/dbe43202405281449446456.png" style=" width: 108rpx;
+ height: 84rpx;">
+ </image>
+ <image v-else src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/22059202405281826183468.png" style="width: 108rpx; height: 84rpx;">
+ </image>
+ </view>
+ </view>
+ <view class="card-footer" v-if="item.nums && item.price">
+ 共{{item.nums}}{{item.unit_name}} 合计:<text
+ style="font-size: 28rpx;color: #FC452F;font-weight: 700;">￥{{(item.nums*item.price).toFixed(2)}}</text>
+ </view>
+ <u-line style="margin-top: 30rpx;" color="#F3F3F3"></u-line>
+ </view>
+ <u-empty v-if="lists.length==0" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
+ </u-empty>
+ </view>
- <view class="submit-btn" v-if="tabIndex==1">
- <u-button shape='circle' color='#20B128' @click="submit" text="提交"></u-button>
- </view>
- </view>
- </view>
+ <view class="submit-btn" v-if="tabIndex==1">
+ <u-button shape='circle' color='#20B128' @click="submit" text="提交"></u-button>
+ </view>
+ <view class="submit-btn" v-if="tabIndex==2">
+ <u-button shape='circle' color='#20B128' @click="showDeliver" text="立即发货"></u-button>
+ </view>
+ <uni-popup ref="deliver" type="center" @click.stop="">
+ <view class="deliver">
+ <view style="font-size: 32rpx;font-weight: bold;text-align: center;">发货</view>
+ <u--form labelPosition="left" style="width: 100%;" labelWidth="auto" :model="model1" :rules="rules"
+ ref="uForm">
+ <u-form-item label="配送方式" borderBottom>
+ <u-radio-group v-model="model_type" placement="row" @change="model1.delivery_name='';model1.delivery_id=''">
+ <u-radio label="自己配送" :name="2" style="margin-right: 20rpx;"></u-radio>
+ <u-radio label="快递配送" :name="1"></u-radio>
+ </u-radio-group>
+ </u-form-item>
+ <block v-if="model_type==1">
+ <u-form-item label="快递公司" prop="delivery_name" @tap="deliveryNameShow=true" borderBottom>
+ <u--input v-model="model1.delivery_name" readonly border="none" placeholder="请选择快递公司" suffixIcon="arrow-right"></u--input>
+ </u-form-item>
+ <u-form-item label="物流单号" prop="delivery_id" borderBottom>
+ <u--input v-model="model1.delivery_id" border="none" placeholder="请输入物流单号"></u--input>
+ </u-form-item>
+ </block>
+ <block v-if="model_type==2">
+ <u-form-item label="送货人姓名" prop="delivery_name" borderBottom>
+ <u--input v-model="model1.delivery_name" border="none" placeholder="请输入送货人姓名"></u--input>
+ </u-form-item>
+ <u-form-item label="送货人电话" prop="delivery_id" borderBottom>
+ <u--input v-model="model1.delivery_id" border="none" placeholder="请输入送货人电话"></u--input>
+ </u-form-item>
+ </block>
+ </u--form>
+ <u-button shape='circle' style="margin-top: 80rpx;" color='#20B128' @click="onExpress" text="确认发货"></u-button>
+ <u-picker
+ :show="deliveryNameShow"
+ :columns="[columns]"
+ title="请选择快递公司"
+ @cancel="deliveryNameShow = false"
+ @confirm="changeName"
+ >
+ </u-picker>
+ </view>
+ </uni-popup>
+ </view>
+ </view>
</template>
<script>
- import {
- OpurchaseGoodsOfferApi,
- OpurchaseGoodsOfferListApi
- } from "@/api/supplier.js"
+ import { Toast } from "../../libs/uniApi";
+ import {
+ OpurchaseGoodsOfferApi,
+ OpurchaseGoodsOfferListApi,
+ OpurchaseclassExpressApi,
+ ExpressListApi
+ } from "@/api/supplier.js"
- export default {
- data() {
- return {
- tabIndex: 1,
- tabsLeft: 0,
- tabsRight: 0,
- loading: false,
- lists: [],
- date: "",
- ycn: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/739c3202405071458553459.png',
- wcj: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/04c2c202405071501462462.png',
- ybj: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/274ad202405111523222891.png',
- }
- },
- methods: {
- navgo(url) {
- uni.navigateTo({
- url
- })
- },
- getTabsPosi() {
- const {
- windowWidth
- } = uni.getSystemInfoSync();
- this.tabsLeft = (((windowWidth / 2) - 26) / 2)
- this.tabsRight = (this.tabsLeft + (windowWidth / 2))
- },
- async getLists(type) {
- let that = this
- OpurchaseGoodsOfferListApi({
- type: type || this.tabIndex,
- date: this.date
- }).then(res => {
- this.lists = res.data.lists
- this.lists.forEach(item => {
- if (!(+item.nums)) {
- item.nums = ''
- }
- if (!(+item.price)) {
- item.price = ''
- }
- })
- })
- that.loading = true
- setTimeout(() => {
- that.loading = false
- }, 1000)
- },
- changeTabs(num) {
- let that = this
- this.tabIndex = num
- this.getLists()
- },
- priceBlur(i) {
- this.lists[i].price = (+this.lists[i].price).toFixed(2)
- },
- async submit() {
- let data =
- this.lists.filter(item => {
- return (+item.price && +item.nums)
- }).map(item => {
- return {
- id: item.id,
- nums: item.nums,
- price: item.price
- }
- })
- if (!data.length) return
- console.log(data)
- let res = await OpurchaseGoodsOfferApi({
- data: data
- })
- this.getLists(1)
- }
- },
- onLoad(option) {
- this.date = option.date
- this.getTabsPosi()
- this.getLists()
- // OpurchaseGoodsOfferListApi()
+ export default {
+ data() {
+ return {
+ tabIndex: 1,
+ tabsLeft: 0,
+ tabsRight: 0,
+ loading: false,
+ lists: [],
+ date: "",
+ ycn: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/739c3202405071458553459.png',
+ wcj: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/04c2c202405071501462462.png',
+ ybj: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/274ad202405111523222891.png',
+ model_type: 2,
+ deliveryNameShow: false,
+ model1: {
+ delivery_name: "",
+ delivery_id: "",
+ },
+ rules: {
+ delivery_name: {
+ type: 'string',
+ required: true,
+ message: '不可为空',
+ trigger: ['change', 'blur']
+ },
+ delivery_id: {
+ type: 'string',
+ required: true,
+ message: '不可为空',
+ trigger: ['change', 'blur']
+ }
+ },
+ columns: []
+ }
+ },
+ methods: {
+ navgo(url) {
+ uni.navigateTo({
+ url
+ })
+ },
+ getTabsPosi() {
+ const {
+ windowWidth
+ } = uni.getSystemInfoSync();
+ this.tabsLeft = (((windowWidth / 2) - 26) / 2)
+ this.tabsRight = (this.tabsLeft + (windowWidth / 2))
+ },
+ async getLists(type) {
+ let that = this
+ OpurchaseGoodsOfferListApi({
+ type: type || this.tabIndex,
+ date: this.date
+ }).then(res => {
+ this.lists = res.data.lists
+ this.lists.forEach(item => {
+ if (!(+item.nums)) {
+ item.nums = ''
+ }
+ if (!(+item.price)) {
+ item.price = ''
+ }
+ })
+ })
+ that.loading = true
+ setTimeout(() => {
+ that.loading = false
+ }, 1000)
+ },
+ changeTabs(num) {
+ let that = this
+ this.tabIndex = num
+ this.getLists()
+ },
+ priceBlur(i) {
+ this.lists[i].price = (+this.lists[i].price).toFixed(2)
+ },
+ async submit() {
+ let data =
+ this.lists.filter(item => {
+ return (+item.price && +item.nums)
+ }).map(item => {
+ return {
+ id: item.id,
+ nums: item.nums,
+ price: item.price
+ }
+ })
+ if (!data.length) return ;
+ let res = await OpurchaseGoodsOfferApi({
+ data: data
+ })
+ this.getLists(1)
+ },
+ showDeliver() {
+ this.getAction();
+ this.$refs.deliver.open()
+ },
+ // 发货
+ onExpress() {
+ this.$refs.uForm.validate().then(res=>{
+ OpurchaseclassExpressApi({
+ ...this.model1,
+ date: this.date
+ }).then(res => {
+ this.getLists(2);
+ this.$refs.deliver.close();
+ Toast('发货成功')
+ })
+ })
+ },
+ // 物流公司列表
+ getAction(){
+ ExpressListApi({
+ page_size: 100
+ }).then(res=>{
+ this.columns = res.data.lists.map(item=>item.name);
+ })
+ },
+ changeName(e){
+ this.model1.delivery_name = e.value[0];
+ this.deliveryNameShow = false;
+ },
+ },
+ onLoad(option) {
+ this.date = option.date
+ this.getTabsPosi()
+ this.getLists()
+ // OpurchaseGoodsOfferListApi()
- }
- }
+ }
+ }
</script>
<style lang="scss">
- .head {
- padding: 20rpx;
- background-color: white;
- position: relative;
- position: fixed;
- top: 0;
- width: 100vw;
- z-index: 10;
+ .head {
+ padding: 20rpx;
+ background-color: white;
+ position: relative;
+ position: fixed;
+ top: 0;
+ width: 100vw;
+ z-index: 10;
- .act {
- color: #20B128;
- }
+ .act {
+ color: #20B128;
+ }
- .line {
- width: 26px;
- height: 5rpx;
- background-color: #20B128;
- border-radius: 50rpx;
- position: absolute;
- transition: 300ms;
- }
- }
+ .line {
+ width: 26px;
+ height: 5rpx;
+ background-color: #20B128;
+ border-radius: 50rpx;
+ position: absolute;
+ transition: 300ms;
+ }
+ }
- .content {
- padding: 20rpx;
- padding-bottom: 150rpx;
+ .content {
+ padding: 20rpx;
+ padding-bottom: 150rpx;
- .card {
- width: 710rpx;
- margin: 0 auto;
- padding: 20rpx;
- box-sizing: border-box;
- background-color: white;
+ .card {
+ width: 710rpx;
+ margin: 0 auto;
+ padding: 20rpx;
+ box-sizing: border-box;
+ background-color: white;
- .card-content {
- display: flex;
- position: relative;
+ .card-content {
+ display: flex;
+ position: relative;
- .card-content-l {
- margin-right: 20rpx;
- position: relative;
+ .card-content-l {
+ margin-right: 20rpx;
+ position: relative;
- .status {
- width: 152rpx;
- height: 40rpx;
- background-color: rgba(0, 0, 0, .3);
- text-align: center;
- color: white;
- font-size: 24rpx;
- line-height: 40rpx;
- position: absolute;
- bottom: 0;
- }
- }
+ .status {
+ width: 152rpx;
+ height: 40rpx;
+ background-color: rgba(0, 0, 0, .3);
+ text-align: center;
+ color: white;
+ font-size: 24rpx;
+ line-height: 40rpx;
+ position: absolute;
+ bottom: 0;
+ }
+ }
- .card-content-r {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
+ .card-content-r {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
- .title {
- font-size: 30rpx;
- width: 500rpx;
- }
+ .title {
+ font-size: 30rpx;
+ width: 500rpx;
+ }
- .need {
- color: #777777;
- font-size: 24rpx;
- }
+ .need {
+ color: #777777;
+ font-size: 24rpx;
+ }
- .ipt {
- display: flex;
- height: 56rpx;
+ .ipt {
+ display: flex;
+ height: 56rpx;
- }
- }
+ }
+ }
- .status-png {
- position: absolute;
- right: 20rpx;
- }
+ .status-png {
+ position: absolute;
+ right: 20rpx;
+ }
- }
+ }
- .card-footer {
- margin-top: 30rpx;
- text-align: right;
- font-size: 28rpx;
- color: #060606;
- }
- }
+ .card-footer {
+ margin-top: 30rpx;
+ text-align: right;
+ font-size: 28rpx;
+ color: #060606;
+ }
+ }
- .submit-btn {
- position: fixed;
- bottom: 70rpx;
- width: 710rpx;
- margin: 0 auto;
- }
- }
+ .submit-btn {
+ position: fixed;
+ bottom: 70rpx;
+ width: 710rpx;
+ margin: 0 auto;
+ }
+ }
- .ellipsis {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
+ .ellipsis {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ .deliver {
+ width: 600rpx;
+ height: 500rpx;
+ background-color: #fff;
+ border-radius: 14rpx;
+ padding: 20rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: center;
+ }
</style>
\ No newline at end of file
diff --git a/static/images/dbj.png b/static/images/dbj.png
deleted file mode 100644
index d7d04b8..0000000
Binary files a/static/images/dbj.png and /dev/null differ
diff --git a/static/images/wcn.png b/static/images/wcn.png
deleted file mode 100644
index 0cbb0fb..0000000
Binary files a/static/images/wcn.png and /dev/null differ
diff --git a/static/images/ybj.png b/static/images/ybj.png
deleted file mode 100644
index f10606d..0000000
Binary files a/static/images/ybj.png and /dev/null differ
diff --git a/static/images/ycn.png b/static/images/ycn.png
deleted file mode 100644
index ca5bce2..0000000
Binary files a/static/images/ycn.png and /dev/null differ