2022-8-17

manifest.json

@@ -1,153 +1,151 @@
 {
-	"name": "艺绘",
-	"appid": "__UNI__E01ACD1",
-	"description": "",
-	"versionName": "1.0.9",
-	"versionCode": 109,
-	"transformPx": false,
-	"app-plus": {
-		/* 5+App特有相关 */
-		"usingComponents": true,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {
-			"Payment": {}
-		},
-		/* 模块配置 */
-		"distribute": {
-			/* 应用发布信息 */
-			"android": {
-				/* android打包配置 */
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<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_EXTERNAL_STORAGE\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
-			},
-			"ios": {
-				"idfa": false,
-				"capabilities": {
-					"entitlements": {
-						"com.apple.developer.associated-domains": [
-							"applinks:static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com"
-						]
-					}
-				},
-				"privacyDescription": {
-					"NSPhotoLibraryUsageDescription": "使您上传个性化头像",
-					"NSPhotoLibraryAddUsageDescription": "使您上传个性化头像",
-					"NSCameraUsageDescription": "使用摄像头可以让你更好的上传个性化头像"
-				},
-				"dSYMs": false
-			},
-			/* ios打包配置 */
-			"sdkConfigs": {
-				"maps": {},
-				"oauth": {},
-				"geolocation": {},
-				"payment": {
-					"alipay": {
-						"__platform__": ["ios", "android"]
-					}
-				},
-				"push": {},
-				"share": {},
-				"speech": {},
-				"statics": {},
-				"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": {
-				"androidStyle": "default",
-				"android": {
-					"hdpi": "unpackage/res/bage/480.9.png",
-					"xhdpi": "unpackage/res/bage/720.9.png",
-					"xxhdpi": "unpackage/res/bage/1080.9.png"
-				},
-				"iosStyle": "common",
-				"ios": {
-					"storyboard": "C:/Users/Administrator/Desktop/苹果/wlg.zip"
-				}
-			}
-		}
-	},
-	/* SDK配置 */
-	"quickapp": {},
-	/* 快应用特有相关 */
-	"mp-weixin": {
-		/* 小程序特有相关 */
-		"usingComponents": true,
-		"appid": "",
-		"setting": {
-			"urlCheck": true
-		}
-	},
-	"h5": {
-		"title": "s",
-		"domain": "",
-		"router": {
-			"base": "/index/",
-			"mode": "hash"
-		},
-		"devServer": {
-			"proxy": {
-				"/api": {
-					"target": "http://www.zhejianghuiyi.art/api",
-					// "target" : "http://bsn.frp.liuniu946.com/api",
-					// "changeOrigin": true,
-					"pathRewrite": {
-						"/api": "" // rewrite path
-					}
-				}
-			}
-		},
-		"sdkConfigs": {
-			"maps": {}
-		}
-	},
-	"_spaceID": "f2ce8da9-3823-402a-bd21-675f08b3b09b"
+    "name" : "艺绘",
+    "appid" : "__UNI__E01ACD1",
+    "description" : "",
+    "versionName" : "1.0.10",
+    "versionCode" : 110,
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {
+            "Payment" : {}
+        },
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<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_EXTERNAL_STORAGE\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+            },
+            "ios" : {
+                "idfa" : false,
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com" ]
+                    }
+                },
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "使您上传个性化头像",
+                    "NSPhotoLibraryAddUsageDescription" : "使您上传个性化头像",
+                    "NSCameraUsageDescription" : "使用摄像头可以让你更好的上传个性化头像"
+                },
+                "dSYMs" : false
+            },
+            /* ios打包配置 */
+            "sdkConfigs" : {
+                "maps" : {},
+                "oauth" : {},
+                "geolocation" : {},
+                "payment" : {
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "push" : {},
+                "share" : {},
+                "speech" : {},
+                "statics" : {},
+                "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" : {
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "unpackage/res/bage/480.9.png",
+                    "xhdpi" : "unpackage/res/bage/720.9.png",
+                    "xxhdpi" : "unpackage/res/bage/1080.9.png"
+                },
+                "iosStyle" : "common",
+                "ios" : {
+                    "storyboard" : "C:/Users/Administrator/Desktop/苹果/wlg.zip"
+                }
+            }
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "usingComponents" : true,
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : true
+        }
+    },
+    "h5" : {
+        "title" : "s",
+        "domain" : "",
+        "router" : {
+            "base" : "/index/",
+            "mode" : "hash"
+        },
+        "devServer" : {
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://www.zhejianghuiyi.art/api",
+                    // "target" : "http://bsn.frp.liuniu946.com/api",
+                    // "changeOrigin": true,
+                    "pathRewrite" : {
+                        "/api" : "" // rewrite path
+                    }
+                }
+            }
+        },
+        "sdkConfigs" : {
+            "maps" : {}
+        }
+    },
+    "_spaceID" : "f2ce8da9-3823-402a-bd21-675f08b3b09b"
 }

pages/product/product.vue

@@ -13,9 +13,9 @@
 				<view class="hd">
 					{{shopDetail.store_name}}
 				</view>
-				<view class="content-img">
+				<!-- <view class="content-img">
 					<image src="../../static/img/fx.png" mode=""></image>分享
-				</view>
+				</view> -->
 			</view>
 			<view class="content-center" v-if="isSc==2">
 				<view class="title">

pages/user/user.vue

@@ -9,7 +9,11 @@
 					{{userInfo.nickname || '游客'}}
 				</view>
 				<view class="title-bottom">
-					{{userInfo.phone}}
+					<text class="padding-r-10">{{userInfo.phone}}</text>
+					<text v-if="userInfo.is_company==1">分公司</text>
+					<text v-else>
+						{{userInfo.is_partner==1?'分销商':''}}
+					</text>
 				</view>
 			</view>
 		</view>
@@ -141,7 +145,7 @@
 							<view class="content-price">
 								<view class="price">
 									￥{{item.price}}
-			
+
 									<!-- ￥{{item.class_info.name}} -->
 								</view>
 								<view class="" v-show="tabCurrentIndex!=1">
@@ -156,8 +160,8 @@
 						</view>
 					</view>
 				</view>
-				<uni-load-more :status="navitem.loadingType"
-					v-if="!(navitem.orderList.length == 0 && navitem.loaded)"></uni-load-more>
+				<uni-load-more :status="navitem.loadingType" v-if="!(navitem.orderList.length == 0 && navitem.loaded)">
+				</uni-load-more>
 			</scroll-view>
 		</view>
 		<!-- 客服 -->
@@ -249,7 +253,7 @@
 				id: 0,
 				item: '', //当前选中要操作卖出商品的数据
 				money: '', //卖出价格
-				kfWX:'liuniu',//客服微信
+				kfWX: 'liuniu', //客服微信
 				// 头部图高度
 				tabCurrentIndex: 0,
 				navList: [{
@@ -298,8 +302,7 @@
 				this.loadBaseData();
 			}
 		},
-		onReady() {
-		},
+		onReady() {},
 		computed: {
 			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 		},
@@ -428,10 +431,10 @@
 				this.$refs.popupkf.close();
 			},
 			// 赋值客服
-			uniCopy(text){
+			uniCopy(text) {
 				this.$refs.popupkf.close();
 				const a = uniCopy(text)
-				if(a){
+				if (a) {
 					uni.showModal({
 						title: '提示',
 						content: '复制成功',
@@ -578,7 +581,7 @@
 
 		.title-tit {
 			margin-left: 30rpx;
-
+			flex-grow: 1;
 			.title-top {
 				font-size: 36rpx;
 				font-weight: 500;