mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#1) from dev into master

Browse Source 
Reviewed-on: #1
This commit is contained in:
weipengfei 2024-04-24 18:14:18 +08:00
commit d7c7f82ec3
14 changed files with 1229 additions and 1004 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1063
App.vue
View File

File diff suppressed because it is too large Load Diff

24
components/payment/index.vue
View File

@ -82,6 +82,10 @@
returnUrl: { returnUrl: {
type: String, type: String,
default: '' default: ''
},
sale_type: {
type: [Number,String],
default: 1
} }
}, },
data() { data() {
@ -235,7 +239,7 @@
icon: 'success' icon: 'success'
}, { }, {
tab: 5, tab: 5,
url: goPages + '?status=1' url: goPages + '?status=1&sale_type=' + that.sale_type
}); });
break; break;
case 'alipay': case 'alipay':
@ -267,7 +271,7 @@
icon: 'success' icon: 'success'
}, { }, {
tab: 5, tab: 5,
url: goPages + 'status=1' url: goPages + 'status=1&sale_type=' + that.saleType
}); });
}).catch(res => { }).catch(res => {
console.log('测试支付数据无效的catch：' + res.data) console.log('测试支付数据无效的catch：' + res.data)
@ -281,7 +285,7 @@
title: '取消支付' title: '取消支付'
}, { }, {
tab: 5, tab: 5,
url: goPages + '?status=0' url: goPages + '?status=0&sale_type=' + that.sale_type
}); });
} }
} }
@ -306,7 +310,7 @@
icon: 'success' icon: 'success'
}, { }, {
tab: 5, tab: 5,
url: goPages + 'status=1' url: goPages + 'status=1&sale_type=' + that.sale_type
}); });
}, },
fail: (e) => { fail: (e) => {
@ -319,7 +323,8 @@
title: '取消支付' title: '取消支付'
}, { }, {
tab: 5, tab: 5,
url: goPages + '?status=0' url: goPages + '?status=0&sale_type=' + that
.sale_type
}); });
} }
}, },
@ -354,7 +359,8 @@
icon: 'success' icon: 'success'
}, { }, {
tab: 5, tab: 5,
url: goPages + '?status=1' url: goPages + '?status=1&sale_type=' + that
.sale_type
}); });
return that.$util.Tips({ return that.$util.Tips({
@ -362,7 +368,8 @@
icon: 'success' icon: 'success'
}, { }, {
tab: 5, tab: 5,
url: goPages + '?status=1' url: goPages + '?status=1&sale_type=' + that
.sale_type
}); });
}, },
fail: function(e) { fail: function(e) {
@ -434,7 +441,8 @@
icon: 'success' icon: 'success'
}, { }, {
tab: 5, tab: 5,
url: goPages + 'status=1' url: goPages + 'status=1&sale_type=' + that
.sale_type
}); });
}, },

700
manifest.json
View File

@ -1,352 +1,352 @@
{ {
"name" : "惠农生活", "name": "惠农生活",
"appid" : "__UNI__3A527D1", "appid": "__UNI__3A527D1",
"description" : "", "description": "",
"versionName" : "2.0.34", "versionName": "2.0.37",
"versionCode" : 2034, "versionCode": 2037,
"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" : false, "alwaysShowBeforeRender": false,
"waiting" : false, "waiting": false,
"autoclose" : true, "autoclose": true,
"delay" : 0 "delay": 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules" : { "modules": {
"VideoPlayer" : {}, "VideoPlayer": {},
"OAuth" : {}, "OAuth": {},
"Payment" : {}, "Payment": {},
"Share" : {}, "Share": {},
"iBeacon" : {}, "iBeacon": {},
"Maps" : {}, "Maps": {},
"Geolocation" : {}, "Geolocation": {},
"UniMP" : { "UniMP": {
"description" : "uni小程序" "description": "uni小程序"
}, },
"Push" : {}, "Push": {},
"Barcode" : {}, "Barcode": {},
"Camera" : {} "Camera": {}
}, },
"safearea" : { "safearea": {
"bottom" : { "bottom": {
"offset" : "none" "offset": "none"
} }
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute": {
/* android打包配置 */ /* android打包配置 */
"android" : { "android": {
"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.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.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_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>" "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
], ],
"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" //拨打电话权限关闭
}, },
"minSdkVersion" : 23, "minSdkVersion": 23,
"targetSdkVersion" : 30 "targetSdkVersion": 30
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : { "ios": {
"privacyDescription" : { "privacyDescription": {
"NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报", "NSPhotoLibraryUsageDescription": "上传用户头像保存分享海报",
"NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报", "NSPhotoLibraryAddUsageDescription": "上传用户头像保存分享海报",
"NSCameraUsageDescription" : "上传用户头像保存分享海报", "NSCameraUsageDescription": "上传用户头像保存分享海报",
"NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店", "NSLocationWhenInUseUsageDescription": "根据客户地理位置推荐最近门店",
"NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店" "NSLocationAlwaysUsageDescription": "根据客户地理位置推荐最近门店"
}, },
"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" : "wx2e8f79ff281284f5", "appid": "wx2e8f79ff281284f5",
"UniversalLinks" : "https://shop.lihaink.cn/" "UniversalLinks": "https://shop.lihaink.cn/"
} }
}, },
"share" : { "share": {
"weixin" : { "weixin": {
"appid" : "wx2e8f79ff281284f5", "appid": "wx2e8f79ff281284f5",
"UniversalLinks" : "https://shop.lihaink.cn/" "UniversalLinks": "https://shop.lihaink.cn/"
} }
}, },
"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"
} }
}, },
"push" : {}, "push": {},
"oauth" : { "oauth": {
"weixin" : { "weixin": {
"appid" : "wx2e8f79ff281284f5", "appid": "wx2e8f79ff281284f5",
"UniversalLinks" : "https://shop.lihaink.cn/" "UniversalLinks": "https://shop.lihaink.cn/"
} }
}, },
"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,
"androidStyle" : "common" "androidStyle": "common"
} }
}, },
"nativePlugins" : { "nativePlugins": {
"JG-JCore" : { "JG-JCore": {
"JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3", "JPUSH_APPKEY_IOS": "8a5efd65cda14fafa6e64ad3",
"JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3", "JPUSH_CHANNEL_IOS": "8a5efd65cda14fafa6e64ad3",
"JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e", "JPUSH_APPKEY_ANDROID": "b5f679f4357018605ea6fd2e",
"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" : "uni.UNI3A527D1", "android_package_name": "uni.UNI3A527D1",
"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" : "daebe19b547c43128796a078" "value": "daebe19b547c43128796a078"
}, },
"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" : "true", "JPUSH_ISPRODUCTION_IOS": "true",
"JPUSH_ADVERTISINGID_IOS" : "", "JPUSH_ADVERTISINGID_IOS": "",
"JPUSH_DEFAULTINITJPUSH_IOS" : "true", "JPUSH_DEFAULTINITJPUSH_IOS": "true",
"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" : "uni.UNI3A527D1", "android_package_name": "uni.UNI3A527D1",
"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" : "wx5fb1cc8edb3f8baa", "appid": "wx5fb1cc8edb3f8baa",
"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,
"__usePrivacyCheck__" : true "__usePrivacyCheck__": 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",
"optimization" : { "optimization": {
"treeShaking" : { "treeShaking": {
"enable" : true "enable": true
} }
} }
} }
} }

15
pages/cloud_warehouse/market/market.vue
View File

@ -628,7 +628,7 @@
long: longitude long: longitude
}).then(res => { }).then(res => {
let town = res.data.address_reference.town.title let town = res.data.address_reference.town.title
let street_id = street_id = res.data.address_reference.town.id let street_id = res.data.address_reference.town.id
this.street = res.data.address_reference.town.title; this.street = res.data.address_reference.town.title;
this.$store.commit('setAddress', { this.$store.commit('setAddress', {
street_id: street_id, street_id: street_id,
@ -637,6 +637,19 @@
uni.$emit('getLocation_succees', { uni.$emit('getLocation_succees', {
street_id, street_id,
}); });
uni.$emit('changeAddress', {
addr:{
address: res.data.address,
location: `${res.data.location.lat},${res.data.location.lng}`
},
area: res.data.ad_info.adcode,
latitude: res.data.location.lat,
longitude: res.data.location.lng,
street:{
code: street_id,
name: town
}
})
this.where.location = `${latitude},${longitude}`; this.where.location = `${latitude},${longitude}`;
this.$nextTick(() => { this.$nextTick(() => {
setTimeout(() => { setTimeout(() => {

52
pages/columnGoods/goods_search/index.vue
View File

@ -218,22 +218,22 @@
}, },
methods: { methods: {
getHistoryList(){ getHistoryList(){
userLog({ // userLog({
type: this.isShop ? 2 : 1, // 1是商品搜索记录, 2是店铺搜索记录 // type: this.isShop ? 2 : 1, // 1是商品搜索记录, 2是店铺搜索记录
}).then(res=>{ // }).then(res=>{
this.historyList = res.data; // this.historyList = res.data;
}) // })
// try { try {
// this.historyList = [] this.historyList = []
// this.tempStorage = [] this.tempStorage = []
// let arr = uni.getStorageSync('historyList') let arr = uni.getStorageSync('historyList')
// if (arr.length > 0) { if (arr.length > 0) {
// this.historyList = arr this.historyList = arr
// } else { } else {
// this.historyList = [] this.historyList = []
// } }
// this.tempStorage = this.historyList this.tempStorage = this.historyList
// } catch (e) {} } catch (e) {}
}, },
// 清空历史记录 // 清空历史记录
remove() { remove() {
@ -245,12 +245,13 @@
if (res.confirm) { if (res.confirm) {
self.tempStorage = [] self.tempStorage = []
try { try {
userLogDelete({ // userLogDelete({
type: this.isShop ? 2 : 1, // type: this.isShop ? 2 : 1,
}).then(res=>{ // }).then(res=>{
console.log(res); // console.log(res);
}) // })
self.historyList = [] self.historyList = []
uni.setStorageSync('historyList', self.historyList);
} catch (e) {} } catch (e) {}
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
@ -292,6 +293,15 @@
this.$set(this, 'searchValue', event.detail.value); this.$set(this, 'searchValue', event.detail.value);
}, },
searchBut: function() { searchBut: function() {
if(this.searchValue!='') {
let t = this.historyList.findIndex(item=>item.word==this.searchValue);
let list = [...this.historyList];
if(t!=-1) list.splice(t, 1);
list.unshift({
word: this.searchValue
});
uni.setStorageSync('historyList', list);
}
if (this.back) { if (this.back) {
return uni.navigateBack({ return uni.navigateBack({
success: () => { success: () => {

14
pages/gather/gather.vue
View File

@ -130,7 +130,7 @@
} }
</style> </style>
<template> <template>
<view class="gather"> <view class="gather" @click.stop="clickWhite">
<!--顶部定位--> <!--顶部定位-->
<view class="gather-header"> <view class="gather-header">
<view style="height: var(--status-bar-height);"></view> <view style="height: var(--status-bar-height);"></view>
@ -182,18 +182,18 @@
<view class="content"> <view class="content">
<block v-if="nowMenuList.length > 0"> <block v-if="nowMenuList.length > 0">
<u-transition v-for="(item, index) in nowMenuList" :key="item.name" show> <u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
<view class="examine" @click="editFlag ? removeMenu(item) : clickMenu(item)"> <view class="examine" @click.stop="editFlag ? removeMenu(item) : clickMenu(item)" @longpress="editFlag = true">
<image class="icon_img" :src="item.pic" mode="aspectFit"> <image class="icon_img" :src="item.pic" mode="aspectFit">
</image> </image>
<!-- <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon> --> <!-- <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon> -->
<view v-if="editFlag" class="icon" style="background-color: red;">隐藏</view> <view v-if="editFlag" class="icon" style="background-color: red;">删除</view>
<text class="text">{{ item.name }}</text> <text class="text">{{ item.name }}</text>
</view> </view>
</u-transition> </u-transition>
</block> </block>
<view class="add-box examine" <view class="add-box examine"
style="display: flex;justify-content: center;flex-direction: column;align-items: center;" style="display: flex;justify-content: center;flex-direction: column;align-items: center;"
@click="editFlag = true"> @click.stop="editFlag = true" @longpress="editFlag = true" v-if="!editFlag">
<view class="add-box-icon" <view class="add-box-icon"
style="margin-bottom: 14rpx; width:84rpx;height:84rpx;border: 2rpx solid #40AE36;border-radius: 10rpx;display: flex;justify-content: center;align-items: center;"> style="margin-bottom: 14rpx; width:84rpx;height:84rpx;border: 2rpx solid #40AE36;border-radius: 10rpx;display: flex;justify-content: center;align-items: center;">
<u-icon name="plus" size="25" :bold="true" color="#40AE36"></u-icon> <u-icon name="plus" size="25" :bold="true" color="#40AE36"></u-icon>
@ -209,7 +209,7 @@
</view> </view>
<view class="content"> <view class="content">
<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show> <u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
<view class="examine" @click="pushMenu(item)"> <view class="examine" @click.stop="pushMenu(item)">
<image class="icon_img" :src="item.pic" mode="aspectFit"> </image> <image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
<!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> --> <!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
<view class="icon">添加</view> <view class="icon">添加</view>
@ -524,6 +524,10 @@
} }
}); });
}, },
// 点击空白区域完成添加
clickWhite(){
if(this.editFlag) this.editFlag = false;
}
} }
}; };
</script> </script>

46
pages/index/index.vue
View File

@ -521,27 +521,28 @@
overflow: false, overflow: false,
diyId: 0, diyId: 0,
preview: false, preview: false,
isSupport: true isSupport: true,
isIndexClick: true,
scrollTop: 0
}; };
}, },
onTabItemTap(e) { onTabItemTap(e) {
if (this.isIndexClick) {
uni.pageScrollTo({
scrollTop: 0,
duration: 300
});
} else {
this.isIndexClick = true;
}
}, },
// 滚动监听 // 滚动监听
onPageScroll(e) { onPageScroll(e) {
this.isIndexClick = true;
this.scrollTop = e.scrollTop;
this.isFixed = e.scrollTop > 40; this.isFixed = e.scrollTop > 40;
// uni.setTabBarItem({
// index: 0,
// text: "123",
// selectedIconPath: "/static/tabbar_icon/b-a.png"
// })
// this.$forceUpdate();
if (this.isHeaderSerch) { if (this.isHeaderSerch) {
let isScroll = false let isScroll = false
isScroll = e.scrollTop > 50 isScroll = e.scrollTop > 50
@ -551,6 +552,20 @@
} }
// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件 // 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
uni.$emit('scroll'); uni.$emit('scroll');
if (e.scrollTop >= 100) {
uni.setTabBarItem({
index: 0,
text: "首页",
selectedIconPath: "/static/tabbar_icon/back_a.png"
})
} else {
uni.setTabBarItem({
index: 0,
text: "首页",
selectedIconPath: "/static/tabbar_icon/a-a.png"
})
}
}, },
/** /**
@ -604,7 +619,8 @@
this.activeRouter = '/' + curRoute this.activeRouter = '/' + curRoute
}, },
onShow() { onShow() {
let that = this let that = this;
that.isIntegral = uni.getStorageSync('isIntegral') that.isIntegral = uni.getStorageSync('isIntegral')
// #ifdef APP-PLUS // #ifdef APP-PLUS
if (that.appUpdate.openUpgrade == '1') { if (that.appUpdate.openUpgrade == '1') {
@ -620,6 +636,8 @@
that.isScrolled = res[0].top <= -60 that.isScrolled = res[0].top <= -60
}) })
}) })
this.isIndexClick = false;
if (this.isLogin) { if (this.isLogin) {
this.getUserInfo(); this.getUserInfo();
} }
@ -627,9 +645,7 @@
onHide() { onHide() {
uni.setStorageSync('isIntegral', false) uni.setStorageSync('isIntegral', false)
}, },
onReady() {
},
watch: { watch: {
globalDatas(nVal, oVal) { globalDatas(nVal, oVal) {
// #ifdef H5 // #ifdef H5

17
pages/order_addcart/order_addcart.vue
View File

@ -180,7 +180,7 @@
@ChangCouponsUseState="ChangCouponsUseState"></couponListWindow> @ChangCouponsUseState="ChangCouponsUseState"></couponListWindow>
</block> </block>
<!-- 组件 --> <!-- 组件 -->
<addcartWindow :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr" <addcartWindow :key="addcartKey" :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
@goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow> @goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow>
<Authorize :isShowAuth="isShowAuth"></Authorize> <Authorize :isShowAuth="isShowAuth"></Authorize>
<!--自定义底部tab栏--> <!--自定义底部tab栏-->
@ -260,6 +260,7 @@
}], }],
tabsCurr: 1, tabsCurr: 1,
subsecCurr: 0, subsecCurr: 0,
addcartKey: 0,
domain: HTTP_REQUEST_URL, domain: HTTP_REQUEST_URL,
loading: false, //是否加载中 loading: false, //是否加载中
loadend: false, //是否加载完毕 loadend: false, //是否加载完毕
@ -305,6 +306,7 @@
currSku: '', currSku: '',
newData: {}, newData: {},
activeRouter: '', activeRouter: '',
attrTxt: '',
userInfo: {}, userInfo: {},
mer_info: { mer_info: {
mer_settlement_agree_status: 0 mer_settlement_agree_status: 0
@ -510,12 +512,12 @@
// //打开属性 // //打开属性
// that.DefaultSelect(goods) // that.DefaultSelect(goods)
cartProductAttr(id).then(res => { cartProductAttr(id).then(res => {
if (res.data.attr.length == 0) return Toast('此商品为单规格商品'); if(res.data.attr.length==0)return Toast('此商品为单规格商品');
const sku = {} const sku = {};
res.data.attrValue.forEach((itemn) => { res.data.attrValue.forEach((itemn) => {
if (this.tabsCurr == 2) itemn.price = itemn.wholesale_price; //把价格设置为批发价 if(this.tabsCurr==2) itemn.price = itemn.wholesale_price; //把价格设置为批发价
sku[itemn.sku] = itemn; sku[itemn.sku] = itemn;
}) })
goods.attr = res.data.attr; goods.attr = res.data.attr;
goods.attrValue = res.data.attrValue goods.attrValue = res.data.attrValue
that.attrValue = goods.productAttr.sku that.attrValue = goods.productAttr.sku
@ -526,6 +528,7 @@
that.$set(that, 'productValue', sku); that.$set(that, 'productValue', sku);
let productSelect = sku[that.attrValue]; let productSelect = sku[that.attrValue];
that.isOpen = that.attr.cartAttr = true; that.isOpen = that.attr.cartAttr = true;
this.newVal = sku[goods.productAttr.sku] || Object.keys(sku)[0];
that.DefaultSelect(goods) that.DefaultSelect(goods)
}).catch(err => { }).catch(err => {
return that.$util.Tips({ return that.$util.Tips({

216
pages/store/home/index.vue
View File

@ -2,7 +2,6 @@
<view class="store-home"> <view class="store-home">
<view class="header"> <view class="header">
<view style="height: var(--status-bar-height);"></view> <view style="height: var(--status-bar-height);"></view>
<view class="head-menu"> <view class="head-menu">
<view class="iconfont icon-xiangzuo" @click="goback" style="color: #fff;"></view> <view class="iconfont icon-xiangzuo" @click="goback" style="color: #fff;"></view>
<navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none" <navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none"
@ -86,10 +85,10 @@
</view> </view>
<scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor"> <scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
<!-- nav的占位 -->
<view class="tab-cont" <view class="tab-cont"
:style="viewColor,{'height':'calc(100vh - '+listHeight + (tabActive == 2?' + 84rpx':'')+' )'}" :style="viewColor,{'height':'calc(100vh - '+(listHeight) + (tabActive == 2?' + 84rpx':'')+' )'}"
:class="{noPointer : preview}"> :class="{noPointer : preview}">
<!-- 占位 --> <!-- 占位 -->
<view class="aside-left-placeholder" v-if="tabActive != 2"></view> <view class="aside-left-placeholder" v-if="tabActive != 2"></view>
@ -151,11 +150,28 @@
</view> </view>
<!-- 首页 --> <!-- 首页 -->
<view style="margin:0 auto;" <view style="margin:0px auto;"
v-show="(tabActive == 3 || tabActive == 7 || diyActive == 1 || diyActive == 2) && tabActive != 5 && tabActive != 2"> v-show="(tabActive == 3 || tabActive == 7 || diyActive == 1 || diyActive == 2) && tabActive != 5 && tabActive != 2">
<!-- 二级分类 -->
<scroll-view :scroll-x="true" class="small-classify" :style="{'width':'calc(100vw - 152rpx)'}"
v-if="asideCurr">
<view class="second-item-con-wrap">
<view class="second-item-con" :style="{'flex-wrap':isChangeSecTabStyle?'wrap':''}">
<block v-for="item in secondTabList" :key="item.store_category_id">
<view class="small-classify-item"
:class="{'small-classify-item-active':secondTabCurr == item.store_category_id?true:false}"
@click="onSecondTabChange(item.store_category_id)">
{{item.cate_name}}
</view>
</block>
</view>
<view class="sanjiaoxing" @click="onChangeSecTabStyle"></view>
</view>
</scroll-view>
<!-- 商品 --> <!-- 商品 -->
<view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove" <view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove"
:style="{'width':'calc(100vw - 152rpx)'}"> :style="{'width':'calc(100vw - 152rpx)','padding-top':(!!asideCurr?'94rpx' :'')}">
<view v-if="isColumn" class="goods column"> <view v-if="isColumn" class="goods column">
<view v-for="(item,indx) in goods" :key="indx" class="item" @click="goGoodsDetail(item)"> <view v-for="(item,indx) in goods" :key="indx" class="item" @click="goGoodsDetail(item)">
<view class="image" style="width: 180rpx;height: 180rpx;"> <view class="image" style="width: 180rpx;height: 180rpx;">
@ -197,7 +213,8 @@
<WaterfallsFlow :wfList='goods' @itemTap="goGoodsDetail" :type="1" :isStore="1" /> <WaterfallsFlow :wfList='goods' @itemTap="goGoodsDetail" :type="1" :isStore="1" />
</view> </view>
</view> </view>
<view v-if="goodsLoading" class="acea-row row-center-wrapper loadingicon"> <view v-if="goodsLoading" class="acea-row row-center-wrapper loadingicon"
:style="{'margin-top':!!asideCurr?'94rpx':''}">
<text :hidden="!goodsLoading" class="iconfont icon-jiazai loading"></text> <text :hidden="!goodsLoading" class="iconfont icon-jiazai loading"></text>
{{loadTitle}} {{loadTitle}}
</view> </view>
@ -224,7 +241,8 @@
</view> </view>
</view> </view>
</view> </view>
<view class="acea-row row-center-wrapper loadingicon"> <view class="acea-row row-center-wrapper loadingicon"
:style="{'margin-top':!!asideCurr?'94rpx':''}">
<text :hidden="!categoryLoading" class="iconfont icon-jiazai loading"></text> <text :hidden="!categoryLoading" class="iconfont icon-jiazai loading"></text>
{{loadTitle}} {{loadTitle}}
</view> </view>
@ -373,7 +391,7 @@
navShow: false, navShow: false,
navActive: 0, navActive: 0,
diyActive: 0, diyActive: 0,
tabActive: '', // 底部切换 tabActive: 3, // 底部切换
isCoupon: 0, isCoupon: 0,
keyword: '', keyword: '',
order: '', order: '',
@ -470,7 +488,11 @@
asideCurr: '', asideCurr: '',
CartCount: 0, CartCount: 0,
navHeight: 0, navHeight: 0,
listTop: 0 listTop: 0,
mer_type: '', //区分云仓
secondTabList: [],
secondTabCurr: '', //二级分类
isChangeSecTabStyle: false
} }
}, },
computed: { computed: {
@ -527,6 +549,7 @@
break; break;
case 7: case 7:
this.resetParmas(); this.resetParmas();
this.getMerClassifly();
this.goods = []; this.goods = [];
this.getGoods(); this.getGoods();
break; break;
@ -557,8 +580,9 @@
} }
} }
// #endif // #endif
// 店铺详情
this.getStore(); this.getStore();
this.diyData(); // this.diyData();
shareScence(this.currSpid, this.isLogin); shareScence(this.currSpid, this.isLogin);
this.initHeight(); this.initHeight();
@ -579,6 +603,8 @@
}) })
this.getMerClassifly(); this.getMerClassifly();
// 购物车
this.getCart(); this.getCart();
}, },
@ -617,31 +643,97 @@
getCartCounts({ getCartCounts({
sale_type: this.where.sale_type sale_type: this.where.sale_type
}).then(res => { }).then(res => {
console.log(res)
that.CartCount = res.data[0].count; that.CartCount = res.data[0].count;
}); });
}, },
// 修改菜单 // 修改菜单
onChangeAsideMenu(e) { onChangeAsideMenu(e) {
// 获取二级分类
this.getMerClassifly(e)
this.asideCurr = e; this.asideCurr = e;
this.resetParmas(); this.resetParmas();
this.goods = []; this.goods = [];
this.loadend = false; this.loadend = false;
//重置二级菜单
this.secondTabCurr = '';
this.isChangeSecTabStyle = false;
},
// 获取分类
getMerClassifly(pid) {
const param = {
mer_type: 2,
sale_type: this.where.sale_type,
mer_id: this.id,
mer_type: '',
pid: pid
};
// 云商品(不查询分类下边没有商品的分类)
if (this.tabActive == 7) {
param.mer_type = 1;
}
//一般商品(不查询分类下边没有商品的分类)
if (this.tabActive == 3) {
param.mer_type = 2;
}
getCategoryIndexList(param).then(res => {
//二级分类
if (pid) {
this.secondTabList = [{
cate_name: '全部',
store_category_id: ''
}, ...res.data];
} else { //一级分类
this.asideMenu = [{
cate_name: '全部',
store_category_id: ''
}, ...res.data];
}
this.getGoods();
})
},
// 二级分类
onSecondTabChange(e) {
this.isChangeSecTabStyle = false;
this.secondTabCurr = e;
this.resetParmas();
this.goods = [];
this.loadend = false;
this.getGoods(); this.getGoods();
}, },
// 获取分类 // 商铺底部切换
getMerClassifly() { tab: function(param) {
getCategoryIndexList({ if (param == 9) return uni.switchTab({
mer_type: 2, url: "/pages/order_addcart/order_addcart"
sale_type: this.where.sale_type });
}).then(res => {
this.asideMenu = [{ this.tabActive = param;
cate_name: '全部', this.goodsLoading = this.loadend = this.loading = false;
store_category_id: ''
}, ...res.data]; // 底部tab切换
}) this.secondTabCurr = '';
this.secondTabList = [];
this.asideCurr = '';
this.asideMenu = [];
this.loadend = false;
this.getMerClassifly();
},
// 二级类目样式
onChangeSecTabStyle() {
this.isChangeSecTabStyle = !this.isChangeSecTabStyle;
},
// 商铺首页滚动 navbar 吸顶
scrollHome: function(e) {
// uni.$emit('scroll');
// this.navShow = e.detail.scrollTop >= 50;
}, },
navTo(url) { navTo(url) {
@ -862,7 +954,6 @@
}, },
// 获取商铺商品 // 获取商铺商品
getGoods: function() { getGoods: function() {
console.log(2)
let that = this; let that = this;
if (that.loadend) return; if (that.loadend) return;
if (that.loading) return; if (that.loading) return;
@ -870,7 +961,11 @@
that.goodsLoading = true; that.goodsLoading = true;
that.loadTitle = ''; that.loadTitle = '';
that.where.cate_pid = that.asideCurr;
if (that.secondTabCurr) //有二级查二级
that.where.cate_pid = that.secondTabCurr;
else //无二级查一级
that.where.cate_pid = that.asideCurr;
if (this.tabActive == 7) getStoreCloudGoods(that.id, that.where).then(res => { if (this.tabActive == 7) getStoreCloudGoods(that.id, that.where).then(res => {
that.goodsLoading = false; that.goodsLoading = false;
@ -1079,11 +1174,6 @@
} }
}) })
}, },
// 商铺首页滚动 navbar 吸顶
scrollHome: function(e) {
// uni.$emit('scroll');
// this.navShow = e.detail.scrollTop >= 50;
},
goback: function() { goback: function() {
uni.navigateBack(); uni.navigateBack();
@ -1095,16 +1185,6 @@
}); });
}, },
// 商铺底部切换
tab: function(param) {
console.log(param)
if (param == 9) return uni.switchTab({
url: "/pages/order_addcart/order_addcart"
})
this.tabActive = param;
this.goodsLoading = this.loadend = this.loading = false
},
resetParmas() { resetParmas() {
this.navActive = 0; this.navActive = 0;
this.where = { this.where = {
@ -1112,7 +1192,8 @@
keyword: '', keyword: '',
page: 1, page: 1,
limit: 30, limit: 30,
sale_type: this.where.sale_type sale_type: this.where.sale_type,
cate_pid: ''
} }
}, },
@ -1163,6 +1244,7 @@
} }
}, },
onPageScroll() { onPageScroll() {
this.isChangeSecTabStyle = false;
uni.$emit('scroll'); uni.$emit('scroll');
}, },
onPullDownRefresh() { onPullDownRefresh() {
@ -1177,6 +1259,56 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.small-classify {
position: fixed;
left: 152rpx;
min-height: 94rpx;
background: #fff;
z-index: 100;
padding: 20rpx 20rpx 10rpx;
box-sizing: border-box;
.second-item-con-wrap {
position: relative;
display: flex;
align-items: center;
.second-item-con {
display: flex;
width: 95%;
overflow: auto;
}
.sanjiaoxing {
position: absolute;
right: -2rpx;
top: 20rpx;
width: 0;
height: 0;
border: 12rpx solid;
border-color: #333 transparent transparent transparent;
margin-left: 4rpx;
}
}
.small-classify-item {
flex-shrink: 0;
padding: 10rpx 40rpx;
border-radius: 4rpx;
font-size: 24rpx;
color: #999;
background: #F6F6F6;
text-align: center;
margin-right: 10rpx;
margin-bottom: 10rpx;
}
.small-classify-item-active {
background: #ECFFE8;
color: #40AE36;
}
}
.tab-cont { .tab-cont {
background: #f5f5f5; background: #f5f5f5;
min-height: 500rpx; min-height: 500rpx;
@ -1191,8 +1323,6 @@
position: fixed; position: fixed;
left: 0; left: 0;
z-index: 2; z-index: 2;
display: flex;
flex-wrap: wrap;
width: 152rpx; width: 152rpx;
overflow-y: auto; overflow-y: auto;
background-color: #F4F4F4; background-color: #F4F4F4;
@ -2225,7 +2355,7 @@
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 0; margin: 0 auto;
image { image {
width: 414rpx; width: 414rpx;

35
pages/users/order_list/index.vue
View File

@ -73,7 +73,8 @@
<view class='num'>{{orderData.noComment || 0}}</view> <view class='num'>{{orderData.noComment || 0}}</view>
</view> </view>
</view> --> </view> -->
<navigator class="search acea-row row-middle" :url="`/pages/users/order_list/search?sale_type=${sale_type}`" hover-class="none"> <navigator class="search acea-row row-middle" :url="`/pages/users/order_list/search?sale_type=${sale_type}`"
hover-class="none">
<text class="iconfont icon-sousuo"></text> <text class="iconfont icon-sousuo"></text>
搜索我的订单 搜索我的订单
</navigator> </navigator>
@ -345,7 +346,7 @@
</view> </view>
<!-- <home></home> --> <!-- <home></home> -->
<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" <payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
:totalPrice='totalPrice'></payment> :totalPrice='totalPrice' :sale_type="sale_type"></payment>
<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing> <addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
@ -511,21 +512,19 @@
if (options.status) this.orderStatus = options.status; if (options.status) this.orderStatus = options.status;
let user = this.$store.state.app.userInfo; let user = this.$store.state.app.userInfo;
if (user.mer_info) this.initMerInfo(user); if (user.mer_info) this.initMerInfo(user);
if (this.isLogin) { if (this.isLogin) {
this.page = 1; this.page = 1;
this.loadend = false; this.loadend = false;
this.loading = false; this.loading = false;
this.getOrderData(); this.getOrderData();
this.getOrderList(); this.getOrderList();
this.getUserInfo(); this.getUserInfo();
this.getpreSellOrderList(); this.getpreSellOrderList();
} else { } else {
toLogin() toLogin()
} }
}, },
onShow() {
},
onReady: function() { onReady: function() {
// #ifdef H5 // #ifdef H5
this.$nextTick(() => { this.$nextTick(() => {
@ -731,11 +730,13 @@
uni.hideLoading(); uni.hideLoading();
if (self.orderStatus == 0) { if (self.orderStatus == 0) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/order_details/stay?order_id=' + order_id + '&sale_type=' + this.sale_type url: '/pages/order_details/stay?order_id=' + order_id + '&sale_type=' +
this.sale_type
}) })
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: '/pages/order_details/index?order_id=' + order_id + '&sale_type=' + this.sale_type url: '/pages/order_details/index?order_id=' + order_id + '&sale_type=' +
this.sale_type
}) })
} }
}).catch(() => { }).catch(() => {

36
pages/whole_sale/index.vue
View File

@ -558,7 +558,8 @@
deduction_rate: '', //抵扣比例 deduction_rate: '', //抵扣比例
order: '', // 销量sales, 价格低到高price_asc, 价格高到低price_desc order: '', // 销量sales, 价格低到高price_asc, 价格高到低price_desc
rand: 1, rand: 1,
} },
isIndexClick: true
} }
}, },
computed: { computed: {
@ -571,8 +572,39 @@
this.getNav(); this.getNav();
this.initData(); this.initData();
}, },
onPageScroll() {
onTabItemTap(e) {
if (this.isIndexClick) {
uni.pageScrollTo({
scrollTop: 0,
duration: 300
});
} else {
this.isIndexClick = true;
}
},
onShow() {
console.log(this.isIndexClick)
this.isIndexClick = false;
},
onPageScroll(e) {
uni.$emit('scroll'); uni.$emit('scroll');
if (e.scrollTop >= 100) {
uni.setTabBarItem({
index: 1,
text: "批发",
selectedIconPath: "/static/tabbar_icon/back_a.png"
})
} else {
uni.setTabBarItem({
index: 1,
text: "批发",
selectedIconPath: "/static/tabbar_icon/b-a.png"
})
}
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.initData(true, true); this.initData(true, true);

BIN
static/tabbar_icon/back_a.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

3
utils/uniMP.js
View File

@ -339,7 +339,8 @@ const open = (id = null) => {
uniMP: true, uniMP: true,
token: token, token: token,
avatar: avatar, avatar: avatar,
} },
// path: '/pages/index/index?unimp=true'
}, (ret) => { }, (ret) => {
uni.hideLoading(); uni.hideLoading();
if (0 != ret.code) { if (0 != ret.code) {

2
utils/uniMPevent.js
View File

@ -3,7 +3,7 @@ import {
uniMPgetLocation, uniMPgetLocation,
test test
} from "@/utils/uniMPfunction.js" } from "@/utils/uniMPfunction.js"
console.log(123)
export const initEvent = () => { export const initEvent = () => {
mp.onUniMPEventReceive(async (ret) => { mp.onUniMPEventReceive(async (ret) => {
console.log('小程序事件: ', ret); console.log('小程序事件: ', ret);