aaaa

App.vue

@@ -52,7 +52,7 @@ export default {
 		// #endif
 		// #ifdef APP-PLUS
 		// 判断是否升级
-		getUpApp();
+		// getUpApp();
 		// 获取当前运行系统
 		let system = uni.getStorageSync('platform') || '';
 		if (!system) {

manifest.json

@@ -1,154 +1,152 @@
 {
-	"name": "微乐种",
-	"appid": "__UNI__CDE33A2",
-	"description": "",
-	"versionName": "1.1.3",
-	"versionCode": 113,
-	"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": "使用摄像头可以让你更好的上传个性化头像"
-				}
-			},
-			/* ios打包配置 */
-			"sdkConfigs": {
-				"maps": {},
-				"oauth": {},
-				"geolocation": {},
-				"payment": {
-					"weixin": {
-						"__platform__": ["ios", "android"],
-						"appid": "wxc45bba547e921b9f",
-						"UniversalLinks": "https://static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com/uni-universallinks/__UNI__CDE33A2/"
-					}
-				},
-				"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": "appbase/480.9.png",
-					"xhdpi": "appbase/720.9.png",
-					"xxhdpi": "appbase/1080.9.png"
-				},
-				"iosStyle": "storyboard",
-				"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://lnpt.frp.liuniu946.com/api",
-					"target": "http://wlgogo.cn/api",
-					// "changeOrigin": true,
-					"pathRewrite": {
-						"/api": "" // rewrite path
-					}
-				}
-			}
-		},
-		"sdkConfigs": {
-			"maps": {}
-		}
-	},
-	"_spaceID": "f2ce8da9-3823-402a-bd21-675f08b3b09b"
+    "name" : "数字藏品",
+    "appid" : "__UNI__6E56E0F",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
+    "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" : "使用摄像头可以让你更好的上传个性化头像"
+                }
+            },
+            /* ios打包配置 */
+            "sdkConfigs" : {
+                "maps" : {},
+                "oauth" : {},
+                "geolocation" : {},
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wxc45bba547e921b9f",
+                        "UniversalLinks" : "https://static-f2ce8da9-3823-402a-bd21-675f08b3b09b.bspapp.com/uni-universallinks/__UNI__CDE33A2/"
+                    }
+                },
+                "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" : "appbase/480.9.png",
+                    "xhdpi" : "appbase/720.9.png",
+                    "xxhdpi" : "appbase/1080.9.png"
+                },
+                "iosStyle" : "storyboard",
+                "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://lnpt.frp.liuniu946.com/api",
+                    "target" : "http://bsn.frp.liuniu946.com/api",
+                    // "changeOrigin": true,
+                    "pathRewrite" : {
+                        "/api" : "" // rewrite path
+                    }
+                }
+            }
+        },
+        "sdkConfigs" : {
+            "maps" : {}
+        }
+    },
+    "_spaceID" : "f2ce8da9-3823-402a-bd21-675f08b3b09b"
 }

pages.json

@@ -5,7 +5,9 @@
 	"pages": [{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "微乐种",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
+				"navigationBarTitleText": "数字藏品",
 				"app-plus": {
 					"titleNView": false
 				}
@@ -14,6 +16,8 @@
 		{
 			"path": "pages/index/integral",
 			"style": {
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"navigationBarTitleText": "兑换专区"
 			}
 		},
@@ -21,29 +25,37 @@
 			"path": "pages/money/wallet",
 			"style": {
 				"navigationBarTitleText": "我的余额",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
+				// "app-plus": {
+				// 	"titleNView": {
+				// 		"type": "transparent"
+				// 	}
+				// }
 			}
 		},
 		{
 			"path": "pages/user/yuezz",
 			"style": {
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"navigationBarTitleText": "余额转账"
 			}
 		},
 		{
 			"path": "pages/user/about",
 			"style": {
-				"navigationBarTitleText": "关于我们"
+				"navigationBarTitleText": "关于我们",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/shoping/list",
 			"style": {
-				"navigationBarTitleText": "店铺列表"
+				"navigationBarTitleText": "店铺列表",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 
 			}
 		},
@@ -51,6 +63,8 @@
 			"path": "pages/public/register",
 			"style": {
 				"navigationBarTitleText": "注册",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -60,8 +74,11 @@
 		},
 		{
 			"path": "pages/user/jiedianDetails",
+			
 			"style": {
 				"navigationBarTitleText": "节点团队",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -72,13 +89,17 @@
 		{
 			"path": "pages/user/teamList",
 			"style": {
-				"navigationBarTitleText": "我的推广"
+				"navigationBarTitleText": "我的推广",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/public/login",
 			"style": {
 				"navigationBarTitleText": "登录",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -90,6 +111,8 @@
 			"path": "pages/public/wxLogin",
 			"style": {
 				"navigationBarTitleText": "微信登录",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -102,6 +125,8 @@
 			"path": "pages/public/forget",
 			"style": {
 				"navigationBarTitleText": "忘记密码",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -112,80 +137,104 @@
 		{
 			"path": "pages/user/jiedian",
 			"style": {
-				"navigationBarTitleText": "我的节点"
+				"navigationBarTitleText": "我的节点",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/user/team",
 			"style": {
 				"navigationStyle": "custom",
-				"navigationBarTitleText": "我的推广"
+				"navigationBarTitleText": "我的推广",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/user/cash",
 			"style": {
-				"navigationBarTitleText": "我的现金"
+				"navigationBarTitleText": "我的现金",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/user/whiteJf",
 			"style": {
 				"navigationStyle": "custom",
-				"navigationBarTitleText": "我的肥料"
+				"navigationBarTitleText": "我的肥料",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/user/greenJf",
 			"style": {
 				"navigationStyle": "custom",
-				"navigationBarTitleText": "我的水滴"
+				"navigationBarTitleText": "我的水滴",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/user/purpleJf",
 			"style": {
 				"navigationStyle": "custom",
-				"navigationBarTitleText": "我的阳光"
+				"navigationBarTitleText": "我的阳光",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/user/mallJf",
 			"style": {
 				"navigationStyle": "custom",
-				"navigationBarTitleText": "我的阳光"
+				"navigationBarTitleText": "我的阳光",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/user/shopJf",
 			"style": {
 				"navigationStyle": "custom",
-				"navigationBarTitleText": "能量金豆"
+				"navigationBarTitleText": "能量金豆",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/user/wenpiao",
 			"style": {
 				"navigationStyle": "custom",
-				"navigationBarTitleText": "文票"
+				"navigationBarTitleText": "文票",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/user/greenChange",
 			"style": {
-				"navigationBarTitleText": "洒水壶兑换"
+				"navigationBarTitleText": "洒水壶兑换",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/money/withdmoenys",
 			"style": {
-				"navigationBarTitleText": "转账"
+				"navigationBarTitleText": "转账",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/product/reply",
 			"style": {
 				"navigationBarTitleText": "商品评价",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -196,10 +245,12 @@
 		{
 			"path": "pages/product/product",
 			"style": {
-				"navigationBarTitleText": "详情展示",
+				"navigationBarTitleText": "详情",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"titleNView": {
-						"type": "transparent"
+						// "type": "transparent"
 					}
 				}
 			}
@@ -207,20 +258,26 @@
 		{
 			"path": "pages/product/seckill",
 			"style": {
-				"navigationBarTitleText": "限时秒杀"
+				"navigationBarTitleText": "限时秒杀",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/product/list",
 			"style": {
 				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "商品列表"
+				"navigationBarTitleText": "商品列表",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/product/search",
 			"style": {
 				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				// #ifdef APP-PLUS
 				"navigationStyle": "custom",
 				// #endif
@@ -252,6 +309,8 @@
 			"path": "pages/product/classify",
 			"style": {
 				"navigationStyle": "custom",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -262,31 +321,42 @@
 		{
 			"path": "pages/set/set",
 			"style": {
-				"navigationBarTitleText": "设置"
+				"navigationBarTitleText": "设置",
+				
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
 			"path": "pages/set/address",
 			"style": {
-				"navigationBarTitleText": "收货地址"
+				"navigationBarTitleText": "收货地址",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/set/addressManage",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/set/phone",
 			"style": {
-				"navigationBarTitleText": "绑定手机号"
+				"navigationBarTitleText": "绑定手机号",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/set/user",
 			"style": {
-				"navigationBarTitleText": "绑定上级"
+				"navigationBarTitleText": "绑定上级",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
@@ -298,30 +368,40 @@
 		{
 			"path": "pages/contract/start",
 			"style": {
-				"navigationBarTitleText": "温馨提示"
+				"navigationBarTitleText": "温馨提示",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/contract/agreement",
 			"style": {
-				"navigationBarTitleText": "会员协议"
+				"navigationBarTitleText": "会员协议",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/set/password",
 			"style": {
-				"navigationBarTitleText": "修改密码"
+				"navigationBarTitleText": "修改支付密码",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/set/userinfo",
 			"style": {
-				"navigationBarTitleText": "修改资料"
+				"navigationBarTitleText": "修改资料",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		}, {
 			"path": "pages/cart/cart",
 			"style": {
-				"navigationBarTitleText": "购物车"
+				"navigationBarTitleText": "购物车",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 
@@ -331,13 +411,17 @@
 				// #ifndef MP-WEIXIN
 				"navigationStyle": "custom",
 				// #endif
-				"navigationBarTitleText": "个人中心"
+				"navigationBarTitleText": "个人中心",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/user/award",
 			"style": {
 				"navigationBarTitleText": "奖励明细",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -348,30 +432,40 @@
 		{
 			"path": "pages/user/withdrawal",
 			"style": {
-				"navigationBarTitleText": "奖励提现"
+				"navigationBarTitleText": "奖励提现",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/user/notice",
 			"style": {
-				"navigationBarTitleText": "通知"
+				"navigationBarTitleText": "通知",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/user/favorites",
 			"style": {
-				"navigationBarTitleText": "收藏夹"
+				"navigationBarTitleText": "收藏夹",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		}, {
 			"path": "pages/user/coupon",
 			"style": {
-				"navigationBarTitleText": "我的卡卷"
+				"navigationBarTitleText": "我的卡卷",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/order/order",
 			"style": {
 				"navigationBarTitleText": "我的订单",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"bounce": "none"
 				}
@@ -380,13 +474,17 @@
 		{
 			"path": "pages/order/expressInfo",
 			"style": {
-				"navigationBarTitleText": "快递详情"
+				"navigationBarTitleText": "快递详情",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/order/orderDetail",
 			"style": {
 				"navigationBarTitleText": "订单详情",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"bounce": "none"
 				}
@@ -395,36 +493,48 @@
 		{
 			"path": "pages/order/evaluate",
 			"style": {
-				"navigationBarTitleText": "评论"
+				"navigationBarTitleText": "评论",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/order/orderRefund",
 			"style": {
-				"navigationBarTitleText": "申请退款"
+				"navigationBarTitleText": "申请退款",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/order/createOrder",
 			"style": {
-				"navigationBarTitleText": "创建订单"
+				"navigationBarTitleText": "创建订单",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		}, {
 			"path": "pages/money/pay",
 			"style": {
-				"navigationBarTitleText": "支付"
+				"navigationBarTitleText": "支付",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/money/paySuccess",
 			"style": {
-				"navigationBarTitleText": "支付成功"
+				"navigationBarTitleText": "支付成功",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/money/wallet",
 			"style": {
 				"navigationBarTitleText": "我的钱包",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -435,19 +545,25 @@
 		{
 			"path": "pages/money/account",
 			"style": {
-				"navigationBarTitleText": "提现账号"
+				"navigationBarTitleText": "提现账号",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/money/withdrawal",
 			"style": {
-				"navigationBarTitleText": "提现"
+				"navigationBarTitleText": "提现",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/money/recharge",
 			"style": {
-				"navigationBarTitleText": "充值"
+				"navigationBarTitleText": "充值",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
@@ -471,13 +587,17 @@
 					}
 				},
 				// #endif
-				"navigationBarTitleText": "分类"
+				"navigationBarTitleText": "分类",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/redirect/redirect",
 			"style": {
 				"navigationBarTitleText": "微信登录跳转页面",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"app-plus": {
 					"titleNView": false
 				}
@@ -486,13 +606,17 @@
 		{
 			"path": "pages/category/business",
 			"style": {
-				"navigationBarTitleText": "商圈"
+				"navigationBarTitleText": "商圈",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
 			"path": "pages/game/game",
 			"style": {
-				"navigationBarTitleText": "种植"
+				"navigationBarTitleText": "种植",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 
 			}
 		},
@@ -513,7 +637,9 @@
 		{
 			"path": "pages/user/shareQrCode",
 			"style": {
-				"navigationBarTitleText": "邀请好友"
+				"navigationBarTitleText": "邀请好友",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
 			}
 		},
 		{
@@ -538,6 +664,8 @@
 			"path": "pages/index/jieshao",
 			"style": {
 				"navigationBarTitleText": "公司介绍",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"enablePullDownRefresh": false
 			}
 		},
@@ -545,27 +673,113 @@
 			"path": "pages/index/detail",
 			"style": {
 				"navigationBarTitleText": "公司介绍",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
 				"enablePullDownRefresh": false
 			}
+		}, {
+			"path": "pages/index/cangp",
+			"style": {
+				"navigationBarTitleText": "藏品",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/bazaar",
+			"style": {
+				"navigationBarTitleText": "市场",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/set/changePass",
+			"style": {
+				"navigationBarTitleText": "修改密码",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
+				"enablePullDownRefresh": false
+			}
+
 		}
-	],
+	    ,{
+            "path" : "pages/user/feedback",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "帮助",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/money/success",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "提交成功",
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/set/gongao",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "公告",
+				
+                "enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
+            }
+            
+        }
+        ,{
+            "path" : "pages/user/personal",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "个人资料",
+                "enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
+            }
+            
+        }
+        ,{
+            "path" : "pages/user/realName",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "实名认证",
+                "enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle":"white"
+            }
+            
+        }
+    ],
 	"globalStyle": {
-		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "微乐种",
-		"navigationBarBackgroundColor": "#FFFFFF",
+		"navigationBarTextStyle": "white", 
+		"navigationBarBackgroundColor": "#111111",
 		"backgroundColor": "#f8f8f8"
 	},
 	"tabBar": {
 		"color": "#666666",
 		"selectedColor": "#333333",
 		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
+		"backgroundColor": "#222222",
 		"list": [{
 				"pagePath": "pages/index/index",
-				"iconPath": "static/tabBar/tab-home.png",
-				"selectedIconPath": "static/tabBar/tab-home-current.png",
+				"iconPath": "static/tabBar/tab7.png",
+				"selectedIconPath": "static/tabBar/tab06.png",
 				"text": "首页"
 			},
+
 			// {
 			// 	"pagePath": "pages/category/category",
 			// 	"iconPath": "static/tabBar/tab-cate.png",
@@ -573,23 +787,24 @@
 			// 	"text": "分类"
 			// },
 			{
-				"pagePath": "pages/game/game",
-				"iconPath": "static/tabBar/game.png",
-				"selectedIconPath": "static/tabBar/game-action.png",
-				"text": "种植"
+				"pagePath": "pages/index/cangp",
+				"iconPath": "static/tabBar/tab05.png",
+				"selectedIconPath": "static/tabBar/tab08.png",
+				"text": "藏品"
 			},
 			{
 				"pagePath": "pages/cart/cart",
-				"iconPath": "static/tabBar/tab-cart.png",
-				"selectedIconPath": "static/tabBar/tab-cart-current.png",
-				"text": "购物车"
+				"iconPath": "static/tabBar/tab02.png",
+				"selectedIconPath": "static/tabBar/tab01.png",
+				"text": "市场"
 			},
 			{
 				"pagePath": "pages/user/user",
-				"iconPath": "static/tabBar/tab-my.png",
-				"selectedIconPath": "static/tabBar/tab-my-current.png",
-				"text": "我的"
+				"iconPath": "static/tabBar/tab03.png",
+				"selectedIconPath": "static/tabBar/tab04.png",
+				"text": "首页"
 			}
+
 		]
 	}
 }

pages/contract/agreement.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="box">
-		<view class="title pt20 pb30">微乐种用户/会员注册协议</view>
-		<view class="content">欢迎您访问并使用微乐种服务平台！本协议是您与微乐种平台所有者就微乐种平台服务的相关事宜所订立的协议。</view>
+		<view class="title pt20 pb30">用户/会员注册协议</view>
+		<view class="content">欢迎您访问并使用服务平台！本协议是您与平台所有者就平台服务的相关事宜所订立的协议。</view>
 		<view class="content">
 			为维护您自身权益，请您仔细阅读本协议，您点击“同意并继续”按钮后，本协议即构成对双方具有约束力的法律文件； 阅读本协议过程中，
 			如您不同意本协议或其中任何条款的约定，您应立即停止注册程序。
@@ -63,13 +63,13 @@
 		<view class="content">
 			6.2 本站特有的标识、版面设计、编排方式等版权均属谦沐公司享有,未经本站许可,不得任意复制或转载。
 		</view>
-		<view class="content">6.3 使用本站的任何内容均应注明“来源于微乐种”及署上作者姓名,按法律规定需要支付稿酬的,应当通知本站及作者及支付稿酬,并独立承担一切法律责任。</view>
+		<view class="content">6.3 使用本站的任何内容均应注明“来源于”及署上作者姓名,按法律规定需要支付稿酬的,应当通知本站及作者及支付稿酬,并独立承担一切法律责任。</view>
 		<view class="content">6.4 本站享有所有作品用于其它用途的优先权,包括但不限于网站、电子杂志、平面出版等,但在使用前会通知作者,并按同行业的标准支付稿酬。</view>
 		<view class="content">6.5 本站所有内容仅代表作者自己的立场和观点,与本站无关,由作者本人承担一切法律责任。</view>
 		<view class="content">6.6 恶意转载本站内容的,本站保留将其诉诸法律的权利。</view>
 		<view class="content">七、责任声明</view>
 		<view class="content">
-			7.1 用户明确同意其使用本站网络服务所存在的风险及一切后果将完全由用户本人承担,微乐种对此不承担任何责任。
+			7.1 用户明确同意其使用本站网络服务所存在的风险及一切后果将完全由用户本人承担,对此不承担任何责任。
 		</view>
 		<view class="content">
 			7.2 本站无法保证网络服务一定能满足用户的要求,也不保证网络服务的及时性、安全性、准确性。

pages/contract/privacy.vue

@@ -179,7 +179,7 @@
 			本《隐私政策》尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务,本《隐私政策》会按照本隐私权政策的规定使用和披露您的个人信息。但本《隐私政策》将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外,在未征得您事先许可的情况下,本《隐私政策》不会将这些信息对外披露或向第三方提供。本《隐私政策》会不时更新本隐私权政策。您在同意本《隐私政策》服务使用协议之时,即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本《隐私政策》服务使用协议不可分割的一部分。
 		</view>
 		<!-- <view class="title">开发者：宁德市谦沐商务有限公司</view>
-		<view class="title">应用名：微乐种</view>
+		<view class="title">应用名：</view>
 		<view class="title">公司名称：宁德市谦沐商务有限公司</view>
 		<view class="title">注册地址：福建省宁德市福安市阳头街道工业路150号荣宏外滩C幢1单元303室</view>
 		<view class="title">办公地址：福建省宁德市福安市阳头街道工业路150号荣宏外滩C幢1单元303室</view>

pages/index/bazaar.vue

@@ -0,0 +1,363 @@
+<template>
+	<view class="container">
+		<view class="top">
+			<!-- <image class="top-bg" src="../../static/img/top-bg.png" mode=""></image> -->
+			<view class="top-main flex">
+				<view class="search-box flex" @click="clickSearch()">
+					<image class="search" src="../../static/icon/search-h.png" mode=""></image>
+					<view class="search-font">输入关键词搜索</view>
+				</view>
+			</view>
+			<!-- <swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
+				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
+					@click="bannerNavToUrl(item)">
+					<image :src="item.pic" />
+				</swiper-item>
+			</swiper> -->
+		</view>
+		<view class="box">
+			<view class="box-title">
+				<view class="left">
+					数字藏品
+				</view>
+				<view class="right">
+					查看更多 >
+				</view>
+			</view>
+			<view class="box-content">
+				<view class="img">
+					<image src="../../static/index/nvwang.png" mode=""></image>
+				</view>
+				<view class="content-title">
+					<view class="title">
+						黑道女王
+					</view>
+					<view class="text">
+						黑道研究会 发行
+					</view>
+					<view class="text ">
+						价格:  <text >¥99.99</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		
+		<!-- 客服 -->
+		<uni-popup ref="popupkf" type="center">
+			<view class="popup-box">
+				<view class="img"><image src="../../static/img/img009.png" mode=""></image></view>
+				<view class="mian">
+					<view class="delivery">
+						<view class="title">已经为您定制专属客服</view>
+						<image src="../../static/img/img010.png" mode=""></image>
+					</view>
+					<view class="nocancel">客服VX:{{ text }}</view>
+					<view class="comfirm-box">
+						<view class="cancel" @click="kfClose()">取消</view>
+						<view class="comfirm" @click="comfirm(text)">复制微信</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex';
+// #ifdef H5
+import { weixindata, shareLoad } from '@/utils/wxAuthorized';
+// #endif
+export default {
+	data() {
+		return {
+			text: '',
+			checkid: 0,
+			titleNViewBackground: '',
+			longitude: 0, //经度
+			latitude: 0, //纬度
+			swiperCurrent: 0,
+			swiperLength: 0,
+			carouselList: [], //轮播列表
+			bastList: [], //会员礼包
+			integralList: [], //兑换专区
+			page: 1,
+			limit: 10,
+			loadType: 'more',
+			text: [],
+			article: []
+		};
+	},
+	computed: {
+		...mapState(['loginInterceptor', 'baseURL']),
+		...mapState('user', ['hasLogin', 'userInfo'])
+	},
+	onLoad: function(option) {
+	},
+	onShow: function() {
+	},
+	onReachBottom() {
+		this.getproducts();
+	},
+	methods: {
+		...mapMutations(['setLat', 'setLon']),
+		// 點擊搜索框
+		clickSearch() {
+			uni.navigateTo({
+				// url: '/pages/product/search'
+			});
+		},
+	
+		
+		
+	}
+};
+</script>
+
+<style lang="scss">
+page{
+	width: 750rpx;
+	height: 100%;
+	background: #111111;
+}
+	.top {
+		position: relative;
+		width: 100%;
+		height: 360rpx;
+
+		.top-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			width: 100%;
+			height: 100%;
+		}
+
+		.top-main {
+			position: relative;
+			z-index: 2;
+			padding: 30rpx;
+
+			.search-box {
+				justify-content: center;
+				width: 698rpx;
+				height: 60rpx;
+				background: #191919;
+				
+				// box-shadow: 0px 10rpx 20rpx 0px rgba(4, 114, 69, 0.22);
+				border-radius: 30rpx;
+
+				.search {
+					width: 34rpx;
+					height: 34rpx;
+				}
+
+				.search-font {
+					margin-left: 14rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #a4a4a4;
+				}
+			}
+		}
+	}
+	.box{
+		margin: 0 30rpx;
+		.box-title{
+			display: flex;
+			justify-content: space-between;
+			.left{
+				font-size: 38rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FFFFFF;
+				line-height: 120rpx;
+			}
+			.right{
+				
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 120rpx;
+			}
+			
+		}
+		.box-content{
+			width: 690rpx;
+			height: 915rpx;
+			margin: 50rpx 0;
+			.img{
+				width: 690rpx;
+				height: 690rpx;
+				image{
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.content-title{
+				margin-top: -10rpx;
+				padding: 30rpx 20rpx ;
+				
+				border-bottom-left-radius: 10rpx;
+				border-bottom-right-radius: 10rpx;
+				border: 2rpx solid #533A6A;
+				// box-shadow: 0px 0px 20rpx 0px rgba(79,59,103,0.0600);
+				
+				.title{
+					font-size: 39rpx;
+					font-weight: bold;
+					color: #FFFFFF;
+					margin-bottom: 20rpx;
+					
+				}
+				.text{
+					color: #FFFFFF;
+					font-size: 28rpx;
+				}
+				.text>text{
+					font-size: 32rpx;
+					font-weight: 500;
+					color: #A581FF;
+					line-height: 39px;
+				}
+			}
+		}
+	}
+.popup-box {
+	width: 522rpx;
+	height: 605rpx;
+	background-color: #ffffff;
+	border-radius: 20rpx;
+	position: relative;
+
+	.img {
+		position: relative;
+		top: -56rpx;
+		left: 0;
+		width: 522rpx;
+		height: 132rpx;
+		display: flex;
+		justify-content: center;
+
+		image {
+			border-radius: 20rpx 20rpx 0 0;
+			width: 450rpx;
+			height: 132rpx;
+		}
+	}
+
+	.mian {
+		margin-top: -44rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		// padding: 32rpx 32rpx;
+		background-color: #ffffff;
+		border-radius: 0 0 20rpx 20rpx;
+		text-align: center;
+
+		.delivery {
+			font-size: 40rpx;
+			color: #333333;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+
+			.title {
+			}
+
+			image {
+				margin-top: 48rpx;
+				width: 172rpx;
+				height: 160rpx;
+			}
+		}
+
+		.nocancel {
+			font-size: 32rpx;
+			color: #333333;
+			margin-top: 14rpx;
+		}
+
+		.comfirm-box {
+			margin-top: 52rpx;
+			display: flex;
+			// margin-bottom: 32rpx;
+
+			// justify-content: space-around;
+			.cancel {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 197rpx;
+				height: 74rpx;
+				border: 1px solid #dcc786;
+				border-radius: 38rpx;
+
+				font-size: 32rpx;
+				color: #605128;
+			}
+
+			.comfirm {
+				margin-left: 32rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 197rpx;
+				height: 74rpx;
+				background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+				border-radius: 38px;
+				font-size: 32rpx;
+				color: #605128;
+			}
+		}
+	}
+}
+.tongz {
+	width: 690rpx;
+	height: 70rpx;
+	margin: 32rpx auto 0;
+	padding: 18rpx 30rpx 18rpx 24rpx;
+	align-items: center;
+	position: relative;
+	.tongz-bg {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		width: 690rpx;
+		height: 70rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.tongz-left {
+		width: 640rpx;
+		.image-left {
+			width: 28rpx;
+			height: 34rpx;
+		}
+		.tongz-font {
+			margin-left: 22rpx;
+			font-size: 28rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: #0f253a;
+		}
+	}
+	.tongz-right {
+		position: relative;
+		z-index: 11;
+		width: 12rpx;
+		height: 26rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+</style>

pages/index/cangp.vue

@@ -0,0 +1,417 @@
+<template>
+	<view class="container">
+		<view class="top">
+			<!-- <image class="top-bg" src="../../static/img/top-bg.png" mode=""></image> -->
+			<view class="top-main flex">
+				<view class="search-box flex" @click="clickSearch()">
+					<image class="search" src="../../static/icon/search-h.png" mode=""></image>
+					<view class="search-font">输入关键词搜索</view>
+				</view>
+			</view>
+			<!-- <swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
+				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="bannerNavToUrl(item)">
+					<image :src="item.pic" />
+				</swiper-item>
+			</swiper> -->
+		</view>
+		<view class="box">
+			<view class="box-title">
+				<view class="left">
+					数字藏品
+				</view>
+				<view class="right" @click="navTo('/pages/index/cangp')">
+					查看更多 >
+				</view>
+			</view>
+			<view class="box-content" v-for="(item,index) in list" @click="buy(item)">
+				<view class="img" >
+					<image :src="item.image" mode=""></image>
+				</view>
+				<view class="content-title">
+					<view class="title">
+						{{item.store_name}}
+					</view>
+					<view class="text">
+						黑道研究会 发行
+					</view>
+					<view class="text">
+						发行数量: {{item.sales}}份
+					</view>
+				</view>
+			</view>
+			<!-- <view class="box-content">
+				<view class="img">
+					<image src="../../static/index/nvwang.png" mode=""></image>
+				</view>
+				<view class="content-title">
+					<view class="">
+						黑道女王
+					</view>
+					<view class="text">
+						黑道研究会 发行
+					</view>
+					<view class="text">
+						发行数量: 14521份
+					</view>
+				</view>
+			</view> -->
+		</view>
+		<view class="btm" style="height: 44px;"></view>
+		
+		
+		<!-- 客服 -->
+		<uni-popup ref="popupkf" type="center">
+			<view class="popup-box">
+				<view class="img"><image src="../../static/img/img009.png" mode=""></image></view>
+				<view class="mian">
+					<view class="delivery">
+						<view class="title">已经为您定制专属客服</view>
+						<image src="../../static/img/img010.png" mode=""></image>
+					</view>
+					<view class="nocancel">客服VX:{{ text }}</view>
+					<view class="comfirm-box">
+						<view class="cancel" @click="kfClose()">取消</view>
+						<view class="comfirm" @click="comfirm(text)">复制微信</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		
+	</view>
+</template>
+
+<script>
+	import {
+		getBargainList,
+		getProducts
+	} from '@/api/product.js';
+	// import {mapState} from 'vuex'
+	import {loadIndexs} from '@/api/index.js'
+import { mapState, mapMutations } from 'vuex';
+// #ifdef H5
+import { weixindata, shareLoad } from '@/utils/wxAuthorized';
+// #endif
+export default {
+	data() {
+		return {
+			text: '',
+			checkid: 0,
+			titleNViewBackground: '',
+			longitude: 0, //经度
+			latitude: 0, //纬度
+			swiperCurrent: 0,
+			swiperLength: 0,
+			carouselList: [], //轮播列表
+			bastList: [], //会员礼包
+			integralList: [], //兑换专区
+			list:[],//卡片信息
+			page: 1,
+			limit: 10,
+			loadType: 'more',
+			text: [],
+			article: []
+		};
+	},
+	computed: {
+		...mapState(['loginInterceptor', 'baseURL']),
+		...mapState('user', ['hasLogin', 'userInfo'])
+	},
+	onLoad: function(option) {
+		if(this.hasLogin){
+			this.loadIndex()
+			this.getProduct()
+		}
+	},
+	onShow: function() {
+	},
+	// onReachBottom() {
+	// 	this.getproducts();
+	// },
+	methods: {
+		...mapMutations(['setLat', 'setLon']),
+		loadIndex(){
+			let obj = this
+			loadIndexs().then(res=>{
+				obj.carouselList = res.data.banner
+				// console.log(res,'res');
+				// obj.list = res.data.info.fastList
+				
+			})
+		},
+		getProduct(){
+			let obj = this
+			getProducts().then(res=>{
+				// obj.carouselList = res.data.banner
+				console.log(res,'res');
+				obj.list = res.data
+				
+			})
+		},
+		buy(item){
+			console.log(item,'res');
+		}
+		,
+		navTo(url){
+			uni.switchTab({
+				url
+			})
+		},
+		
+		// 點擊搜索框
+		clickSearch() {
+			uni.navigateTo({
+				// url: '/pages/product/search'
+			});
+		},
+		swiperChange(){
+		}
+	
+		
+		
+	}
+};
+</script>
+
+<style lang="scss">
+page{
+	width: 750rpx;
+	height: 100%;
+	background: #111111;
+}
+	.top {
+		position: relative;
+		width: 100%;
+		height: 360rpx;
+
+		.top-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			width: 100%;
+			height: 100%;
+		}
+
+		.top-main {
+			position: relative;
+			z-index: 2;
+			padding: 30rpx;
+
+			.search-box {
+				justify-content: center;
+				width: 698rpx;
+				height: 60rpx;
+				background: #191919;
+				
+				// box-shadow: 0px 10rpx 20rpx 0px rgba(4, 114, 69, 0.22);
+				border-radius: 30rpx;
+
+				.search {
+					width: 34rpx;
+					height: 34rpx;
+				}
+
+				.search-font {
+					margin-left: 14rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #a4a4a4;
+				}
+			}
+		}
+	}
+	.box{
+		margin: 0 30rpx;
+		.box-title{
+			display: flex;
+			justify-content: space-between;
+			.left{
+				font-size: 38rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FFFFFF;
+				line-height: 120rpx;
+			}
+			.right{
+				
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 120rpx;
+			}
+			
+		}
+		.box-content{
+			width: 690rpx;
+			height: 915rpx;
+			margin: 50rpx 0;
+			.img{
+				width: 690rpx;
+				height: 690rpx;
+		
+				image{
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.content-title{
+				margin-top: -10rpx;
+				padding: 30rpx 20rpx ;
+				
+				border-bottom-left-radius: 10rpx;
+				border-bottom-right-radius: 10rpx;
+				border: 2rpx solid #533A6A;
+				// box-shadow: 0px 0px 20rpx 0px rgba(79,59,103,0.0600);
+				
+				.title{
+					font-size: 39rpx;
+					font-weight: bold;
+					color: #FFFFFF;
+					margin-bottom: 20rpx;
+					
+				}
+				.text{
+					margin: 10rpx 0;
+					color: #FFFFFF;
+					font-size: 28rpx;
+				}
+			}
+		}
+	}
+.popup-box {
+	width: 522rpx;
+	height: 605rpx;
+	background-color: #ffffff;
+	border-radius: 20rpx;
+	position: relative;
+
+	.img {
+		position: relative;
+		top: -56rpx;
+		left: 0;
+		width: 522rpx;
+		height: 132rpx;
+		display: flex;
+		justify-content: center;
+
+		image {
+			border-radius: 20rpx 20rpx 0 0;
+			width: 450rpx;
+			height: 132rpx;
+		}
+	}
+
+	.mian {
+		margin-top: -44rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		// padding: 32rpx 32rpx;
+		background-color: #ffffff;
+		border-radius: 0 0 20rpx 20rpx;
+		text-align: center;
+
+		.delivery {
+			font-size: 40rpx;
+			color: #333333;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+
+			.title {
+			}
+
+			image {
+				margin-top: 48rpx;
+				width: 172rpx;
+				height: 160rpx;
+			}
+		}
+
+		.nocancel {
+			font-size: 32rpx;
+			color: #333333;
+			margin-top: 14rpx;
+		}
+
+		.comfirm-box {
+			margin-top: 52rpx;
+			display: flex;
+			// margin-bottom: 32rpx;
+
+			// justify-content: space-around;
+			.cancel {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 197rpx;
+				height: 74rpx;
+				border: 1px solid #dcc786;
+				border-radius: 38rpx;
+
+				font-size: 32rpx;
+				color: #605128;
+			}
+
+			.comfirm {
+				margin-left: 32rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 197rpx;
+				height: 74rpx;
+				background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+				border-radius: 38px;
+				font-size: 32rpx;
+				color: #605128;
+			}
+		}
+	}
+}
+.tongz {
+	width: 690rpx;
+	height: 70rpx;
+	margin: 32rpx auto 0;
+	padding: 18rpx 30rpx 18rpx 24rpx;
+	align-items: center;
+	position: relative;
+	.tongz-bg {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		width: 690rpx;
+		height: 70rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.tongz-left {
+		width: 640rpx;
+		.image-left {
+			width: 28rpx;
+			height: 34rpx;
+		}
+		.tongz-font {
+			margin-left: 22rpx;
+			font-size: 28rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: #0f253a;
+		}
+	}
+	.tongz-right {
+		position: relative;
+		z-index: 11;
+		width: 12rpx;
+		height: 26rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+</style>

pages/index/index.vue

@@ -1,80 +1,64 @@
 <template>
 	<view class="container">
-		<view class="carousel-section">
-			<!-- 背景色区域 -->
-			<view class="bg"><image src="../../static/index/index1.png" mode=""></image></view>
-			<!-- 标题栏和状态栏占位符 -->
-			<view class="titleNview-placing"></view>
-		</view>
-		<image class="bg3" src="../../static/index/index3.png" mode=""></image>
-		<view class="tongz flex">
-			<view>
-				<view class="tongz-bg"><image src="../../static/img/tongz-bg.png" mode=""></image></view>
-				<view class="tongz-left flex">
-					<image class="image-left" src="../../static/img/ling.png" mode=""></image>
-					<u-notice-bar
-						style="width: 100%;"
-						mode="vertical"
-						type="none"
-						:volume-icon="false"
-						:more-icon="true"
-						:list="text"
-						@click="goDetails"
-						@getMore="navTo('/pages/index/jieshao')"
-					></u-notice-bar>
+		<view class="top">
+			<!-- <image class="top-bg" src="../../static/img/top-bg.png" mode=""></image> -->
+			<view class="top-main flex">
+				<view class="search-box flex" @click="clickSearch()">
+					<image class="search" src="../../static/icon/search-h.png" mode=""></image>
+					<view class="search-font">输入关键词搜索</view>
 				</view>
 			</view>
+			<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
+				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="bannerNavToUrl(item)">
+					<image :src="item.pic" />
+				</swiper-item>
+			</swiper>
 		</view>
-		<view class="main-box" v-if="integralList.length != 0">
-			<view class="main-top">
-				<image src="../../static/icon/indexI.png" mode="" class="main-icon"></image>
-				<view class="main-title">阳光兑换</view>
-				<view class="main-synopsis">超值体验</view>
+		<view class="box">
+			<view class="box-title">
+				<view class="left">
+					数字藏品
+				</view>
+				<view class="right" @click="navTo('/pages/index/cangp')">
+					查看更多 >
+				</view>
 			</view>
-			<view class="main-content">
-				<view class="content-top flex" @click="navTo('/pages/index/integral')">
-					<view class="content-font">
-						<view class="content-title">阳光兑换热门好物</view>
-						<view class="content-synopsis">买到就是赚到</view>
-					</view>
-					<image src="../../static/icon/fanhui.png" class="go" mode=""></image>
+			<view class="box-content" v-for="(item,index) in list" @click="buy(item)">
+				<view class="img" >
+					<image :src="item.image" mode=""></image>
 				</view>
-				<view class="commodity flex">
-					<view class="commodity-item" v-for="(item, index) in integralList" :key="item.id" @click="navToDetailPagejf(item)">
-						<image class="commodity-image" :src="item.image" mode=""></image>
-						<view class="commodity-title clamp">{{ item.store_name }}</view>
-						<view class="price clamp">{{ item.result.value[0].integral * 1 }}阳光+</view>
-						<view class="vip-price">
-							<text>￥{{ item.result.value[0].price }}</text>
-						</view>
+				<view class="content-title">
+					<view class="title">
+						{{item.store_name}}
+					</view>
+					<view class="text">
+						黑道研究会 发行
+					</view>
+					<view class="text">
+						发行数量: {{item.sales}}份
 					</view>
 				</view>
 			</view>
-		</view>
-		<view class="product-box" v-if="bastList.length != 0">
-			<view class="product-title">
-				<image class="pt-image" src="../../static/index/index15.png" mode=""></image>
-				<view class="pt-title">热销商品</view>
-				<view class="pt-tip">好货不用挑</view>
-			</view>
-			<view class="hotgoods">
-				<view class="hotgoods-item" v-for="item in bastList" :key="item.id" @click="navToDetailPage(item)">
-					<view class="image-wrapper">
-						<image class="image-bg" src="../../static/img/libao-bg.png" mode=""></image>
-						<image class="image" :src="item.image" mode="scaleToFill"></image>
+			<!-- <view class="box-content">
+				<view class="img">
+					<image src="../../static/index/nvwang.png" mode=""></image>
+				</view>
+				<view class="content-title">
+					<view class="">
+						黑道女王
 					</view>
-					<view class="title clamp2">{{ item.store_name }}</view>
-					<view class="hot-price">
-						<!-- <view class="hotPrice-box">会员价</view> -->
-						<view class="price">
-							<text class="font-size-sm">￥</text>
-							{{ item.price * 1 }}
-						</view>
-						<view class="yuanPrice">{{ item.ot_price }}</view>
+					<view class="text">
+						黑道研究会 发行
+					</view>
+					<view class="text">
+						发行数量: 14521份
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
+		<view class="btm" style="height: 44px;"></view>
+		
+		
 		<!-- 客服 -->
 		<uni-popup ref="popupkf" type="center">
 			<view class="popup-box">
@@ -92,32 +76,25 @@
 				</view>
 			</view>
 		</uni-popup>
+		
 	</view>
 </template>
 
 <script>
-import { lookSubpoints, lookOneself } from '../../api/user.js';
-import seckill from '../../components/seckill/seckill.vue';
-import { loadIndexs } from '@/api/index.js';
-import { article } from '@/api/user.js';
-import { getUserInfo, spread } from '@/api/user.js';
-import { setCoupons } from '@/api/functionalUnit.js';
-import { getProducts } from '@/api/product.js';
-import { interceptor } from '@/utils/loginUtils';
+	import {
+		getBargainList,
+		getProducts
+	} from '@/api/product.js';
+	// import {mapState} from 'vuex'
+	import {loadIndexs} from '@/api/index.js'
 import { mapState, mapMutations } from 'vuex';
 // #ifdef H5
 import { weixindata, shareLoad } from '@/utils/wxAuthorized';
 // #endif
-import uniCopy from '@/js_sdk/xb-copy/uni-copy.js';
 export default {
-	components: {
-		seckill
-	},
 	data() {
 		return {
 			text: '',
-			pageProportion: 0, //保存页面基于750宽度的比例
-			swiperHeight: 0,
 			checkid: 0,
 			titleNViewBackground: '',
 			longitude: 0, //经度
@@ -127,6 +104,7 @@ export default {
 			carouselList: [], //轮播列表
 			bastList: [], //会员礼包
 			integralList: [], //兑换专区
+			list:[],//卡片信息
 			page: 1,
 			limit: 10,
 			loadType: 'more',
@@ -139,463 +117,172 @@ export default {
 		...mapState('user', ['hasLogin', 'userInfo'])
 	},
 	onLoad: function(option) {
-		// #ifdef MP
-		if (option.scene) {
-			// 存储小程序邀请人
-			uni.setStorage({
-				key: 'spread_code',
-				data: option.scene
-			});
+		if(this.hasLogin){
+			this.loadIndex()
+			this.getProduct()
 		}
-		// #endif
 	},
 	onShow: function() {
-		// 判断是否强制登录
-		// if (!this.hasLogin) {
-		// 	// 登录拦截
-		// 	interceptor();
-		// }
-		this.loadData();
-		this.getproducts();
-	},
-	onReachBottom() {
-		this.getproducts();
 	},
+	// onReachBottom() {
+	// 	this.getproducts();
+	// },
 	methods: {
 		...mapMutations(['setLat', 'setLon']),
-		kfClose() {
-			this.$refs.popupkf.close();
-		},
-		goDetails(e) {
-			uni.navigateTo({
-				url: '/pages/index/detail?id=' + this.article[e].id
-			});
-		},
-		// 复制
-		comfirm(text) {
-			console.log(text);
-			const result = uniCopy(text);
-			if (result === false) {
-				uni.showToast({
-					title: '不支持'
-				});
-			} else {
-				uni.showToast({
-					title: '复制成功',
-					icon: 'none'
-				});
-			}
-			this.$refs.popupkp.close();
-		},
-		navTo(url) {
-			if (url == '') {
-				this.$api.msg('暂未开通，敬请期待');
-			} else {
-				uni.navigateTo({
-					url,
-					fail() {
-						uni.switchTab({
-							url
-						});
-					}
-				});
-			}
-		},
-		// 监听切换事件
-		listChange(e) {
-			this.checkid = e.detail.current;
-		},
-		//积分详情页
-		navToDetailPagejf(item) {
-			uni.navigateTo({
-				url: '/pages/product/product?id=' + item.id + '&isJF=1'
-			});
-		},
-		// 点击触发领取优惠券
-		setCoupons(item) {
-			// 判断是否已经领取了优惠券
-			let obj = this;
-			uni.showModal({
-				title: '领取提示',
-				content: '是否领取优惠券',
-				success(e) {
-					if (e.confirm) {
-						setCoupons({
-							couponId: item.id
-						}).then(e => {
-							item.is_use = true;
-							uni.showToast({
-								title: '领取成功',
-								type: 'top',
-								duration: 2000
-							});
-						});
-					}
-				}
-			});
-		},
-		//商品种类切换
-		change(item) {
-			let id = item;
-			this.checkid = id;
-			if (this.checkid == 1) {
-				// console.log(1);
-				this.detail = this.selected_detail;
-			} else if (this.checkid == 2) {
-				// console.log(2);
-				this.detail = this.new_product;
-			} else {
-				this.detail = this.cheap_good;
-			}
-		},
-		// 监听图片加载完成
-		onImageError(key, index) {
-			this[key][index].image = '/static/error/errorImage.jpg';
-		},
-		// 请求载入数据
-		async loadData() {
-			this.text = [];
-			this.article = [];
-			loadIndexs({})
-				.then(({ data }) => {
-					let goods = data.info;
-					this.carouselList = data.banner;
-					console.log(this.carouselList, 'this.carouselList++++++++');
-					this.swiperLength = this.carouselList.length;
-					this.integralList = data.likeInfo; //兑换专区
-					console.log(data.likeInfo, '123456');
-				})
-				.catch(e => {});
-			article({}, 1).then(({ data }) => {
-				data.forEach(e => {
-					this.text.push(e.synopsis);
-				});
-				this.article = data;
-			});
+		loadIndex(){
+			let obj = this
+			loadIndexs().then(res=>{
+				obj.carouselList = res.data.banner
+				// console.log(res,'res');
+				// obj.list = res.data.info.fastList
+				
+			})
 		},
-		//轮播图切换修改背景色
-		swiperChange(e) {
-			const index = e.detail.current;
-			this.swiperCurrent = index;
-			this.titleNViewBackground = this.carouselList[index].background;
+		getProduct(){
+			let obj = this
+			getProducts().then(res=>{
+				// obj.carouselList = res.data.banner
+				console.log(res,'res');
+				obj.list = res.data
+				
+			})
 		},
-		//详情页
-		navToDetailPage(item) {
-			let id = item.id;
+		buy(item){
+			console.log(item,'res');
 			uni.navigateTo({
-				url: '/pages/product/product?id=' + id + '&isVip=1'
-			});
+				url:'/pages/product/product?id='+item.id
+			})
+		}
+		,
+		navTo(url){
+			uni.switchTab({
+				url
+			})
 		},
-		// 轮播图跳转
-		bannerNavToUrl(item) {
-			// #ifdef H5
-			console.log(item.wap_url.indexOf('http'), 'banner');
-			if (item.wap_url.indexOf('http') >= 0) {
-				window.location.href = item.wap_url;
-			}
-			// #endif
-			//测试数据没有写id，用title代替
+		
+		// 點擊搜索框
+		clickSearch() {
 			uni.navigateTo({
-				url: item.wap_url
+				// url: '/pages/product/search'
 			});
 		},
-		getproducts() {
-			const obj = this;
-			if (obj.loadType == 'loading' || obj.loadType == 'nomore') {
-				return;
-			}
-			obj.loadType = 'loading';
-			getProducts({ page: obj.page, limit: obj.limit }).then(({ data }) => {
-				obj.bastList = obj.bastList.concat(data);
-				if (data.length == obj.limit) {
-					obj.page++;
-					obj.loadType = 'more';
-				} else {
-					obj.loadType = 'nomore';
-				}
-			});
+		swiperChange(){
 		}
+	
+		
+		
 	}
 };
 </script>
 
 <style lang="scss">
-.carousel-section {
-	position: relative;
+page{
 	width: 750rpx;
-	height: 1450rpx;
-
-	.bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 750rpx;
-		height: 1450rpx;
+	height: 100%;
+	background: #111111;
+}
+	.top {
+		position: relative;
+		width: 100%;
+		height: 360rpx;
 
-		image {
+		.top-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
 			width: 100%;
 			height: 100%;
 		}
-	}
 
-	.titleNview-placing {
-		height: var(--status-bar-height);
-		box-sizing: content-box;
-	}
-}
-.bg2 {
-	margin-top: -60rpx;
-	width: 750rpx;
-	height: 250rpx;
-}
-.bg3 {
-	margin-top: -20rpx;
-	width: 750rpx;
-	height: 750rpx;
-}
-.product-box {
-	margin-top: 20rpx;
-	background: #ffffff;
-	padding: 26rpx 30rpx 20rpx;
-
-	.product-title {
-		display: flex;
-		align-items: center;
-
-		.pt-image {
-			width: 26rpx;
-			height: 34rpx;
-		}
-
-		.pt-title {
-			margin-left: 8rpx;
-			font-size: 36rpx;
-			font-family: SourceHanSansCN;
-			font-weight: bold;
-			color: #666666;
-		}
-
-		.pt-tip {
-			margin-left: 16rpx;
-			font-size: 24rpx;
-			font-family: SourceHanSansCN;
-			font-weight: bold;
-			color: #aaaaaa;
-		}
-	}
+		.top-main {
+			position: relative;
+			z-index: 2;
+			padding: 30rpx;
 
-	.hotgoods {
-		margin-top: 38rpx;
-		width: 100%;
-		display: flex;
-		flex-wrap: wrap;
-		padding: 0 0 30rpx;
-
-		.hotgoods-item {
-			width: 48%;
-			background-color: #ffffff;
-			border-radius: 12rpx;
-
-			&:nth-child(2n + 1) {
-				margin-right: 24rpx;
-			}
-
-			.image-wrapper {
-				width: 100%;
-				height: 330rpx;
-				border-radius: 3px;
-				overflow: hidden;
-				position: relative;
-
-				.image-bg {
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					width: 100%;
-					height: 100%;
-					opacity: 1;
-					border-radius: 12rpx 12rpx 0 0;
-					z-index: 2;
-				}
-
-				.image {
-					width: 100%;
-					height: 100%;
-					opacity: 1;
-					border-radius: 12rpx 12rpx 0 0;
-				}
-			}
-
-			.title {
-				margin-top: 24rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-			}
-
-			.hot-price {
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				padding: 14rpx 0 30rpx;
-
-				.hotPrice-box {
-					padding: 2rpx 6rpx;
-
-					background: linear-gradient(90deg, #c79a4c, #f9df7f);
-					border-radius: 5rpx;
-					text-align: center;
-					line-height: 28rpx;
-					font-size: 20rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #ffffff;
-				}
-
-				.price {
-					margin-left: 10rpx;
-					font-size: 40rpx;
-					color: #ff0000;
-					font-weight: 500;
+			.search-box {
+				justify-content: center;
+				width: 698rpx;
+				height: 60rpx;
+				background: #191919;
+				
+				// box-shadow: 0px 10rpx 20rpx 0px rgba(4, 114, 69, 0.22);
+				border-radius: 30rpx;
+
+				.search {
+					width: 34rpx;
+					height: 34rpx;
 				}
 
-				.yuanPrice {
-					margin-left: 10rpx;
-					font-size: 20rpx;
+				.search-font {
+					margin-left: 14rpx;
+					font-size: 28rpx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					text-decoration: line-through;
-					color: #999999;
-				}
-
-				.cart-icon {
-					image {
-						width: 44rpx;
-						height: 44rpx;
-					}
+					color: #a4a4a4;
 				}
 			}
 		}
 	}
-}
-.main-box {
-	background-color: #ffffff;
-	margin-top: 20rpx;
-	padding: 22rpx 30rpx;
-	.main-top {
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
-		.main-icon {
-			width: 36rpx;
-			height: 36rpx;
-		}
-		.main-title {
-			margin-left: 8rpx;
-			font-size: 32rpx;
-			font-family: Source Han Sans CN;
-			font-weight: 500;
-			color: #333333;
-		}
-		.main-synopsis {
-			margin-left: 16rpx;
-			font-size: 20rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #95a0b1;
-		}
-	}
-	.main-content {
-		width: 690rpx;
-		background: #f4f4f4;
-		border-radius: 12rpx;
-		margin: 20rpx auto 0;
-		padding-bottom: 10rpx;
-		.xfq {
-			background: linear-gradient(43deg, #ffc063, #ffa163) !important;
-		}
-		.content-top {
-			width: 690rpx;
-			background: linear-gradient(43deg, #73deb2, #52c696);
-			border-radius: 12rpx 12rpx 0px 0px;
-			padding: 24rpx 22rpx 68rpx 27rpx;
-			.content-font {
-				.content-title {
-					font-size: 32rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 500;
-					color: #ffffff;
-				}
-				.content-synopsis {
-					margin-top: 10rpx;
-					font-size: 24rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #ffffff;
-				}
-			}
-			.go {
-				width: 30rpx;
-				height: 35rpx;
-				transform: rotate(180deg);
-				-ms-transform: rotate(180deg); /* Internet Explorer */
-				-moz-transform: rotate(180deg); /* Firefox */
-				-webkit-transform: rotate(180deg); /* Safari 和 Chrome */
-				-o-transform: rotate(180deg); /* Opera */
-			}
-		}
-	}
-	.commodity {
-		width: 670rpx;
-		background: #ffffff;
-		border-radius: 8rpx;
-		padding: 2rpx;
-		margin: -50rpx auto 0;
-		flex-wrap: wrap;
-		justify-content: flex-start;
-		.commodity-item {
-			width: 33%;
-			padding: 14rpx 30rpx 22rpx;
-			.commodity-image {
-				width: 160rpx;
-				height: 160rpx;
-			}
-			.commodity-title {
-				margin-top: 14rpx;
-				width: 162rpx;
-				font-size: 24rpx;
+	.box{
+		margin: 0 30rpx;
+		.box-title{
+			display: flex;
+			justify-content: space-between;
+			.left{
+				font-size: 38rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #3f3f3f;
+				color: #FFFFFF;
+				line-height: 120rpx;
 			}
-			.price {
+			.right{
+				
 				font-size: 24rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #999999;
+				color: #FFFFFF;
+				line-height: 120rpx;
 			}
-			.vip-price {
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #ff6f0f;
-				image {
-					position: relative;
-					z-index: 10;
-					width: 26rpx;
-					height: 26rpx;
+			
+		}
+		.box-content{
+			width: 690rpx;
+			height: 915rpx;
+			margin: 50rpx 0;
+			.img{
+				width: 690rpx;
+				height: 690rpx;
+		
+				image{
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.content-title{
+				margin-top: -10rpx;
+				padding: 30rpx 20rpx ;
+				
+				border-bottom-left-radius: 10rpx;
+				border-bottom-right-radius: 10rpx;
+				border: 2rpx solid #533A6A;
+				// box-shadow: 0px 0px 20rpx 0px rgba(79,59,103,0.0600);
+				
+				.title{
+					font-size: 39rpx;
+					font-weight: bold;
+					color: #FFFFFF;
+					margin-bottom: 20rpx;
+					
 				}
-				text {
-					display: inline-block;
-					margin-left: 6rpx;
+				.text{
+					margin: 10rpx 0;
+					color: #FFFFFF;
+					font-size: 28rpx;
 				}
 			}
 		}
 	}
-}
 .popup-box {
 	width: 522rpx;
 	height: 605rpx;

pages/money/paySuccess.vue

@@ -1,84 +1,92 @@
 <template>
 	<view class="content">
-		<image class="success-icon" src="../../static/img/paySuccess.png" mode=""></image>
+		<image class="success-icon" src="../../static/user/successPay.png" mode=""></image>
 		<text class="tit">订单支付成功</text>
 		<view class="btn-group">
-			<navigator url="/pages/order/order?state=1" open-type="redirect" class="mix-btn">查看订单</navigator>
+			<!-- <navigator url="/pages/order/order?state=1" open-type="redirect" class="mix-btn">查看订单</navigator> -->
 			<navigator url="/pages/index/index" open-type="switchTab" class="mix-btn hollow">返回首页</navigator>
 		</view>
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			type: 2 //1为兑换支付成功2为预购成功
-		};
-	},
-	onLoad(opt) {
-		// 保存订单号
-		// 	if ('type' in opt) {
-		// 		this.type = opt.type;
-		// 	}
-		// 	if (this.type == 1) {
-		// 		uni.setNavigationBarTitle({
-		// 			title: '兑换成功'
-		// 		});
-		// 	}
-		// 	if (this.type == 2) {
-		// 		uni.setNavigationBarTitle({
-		// 			title: '预约成功'
-		// 		});
-		// 	}
-	},
-	methods: {}
-};
+	export default {
+		data() {
+			return {
+				type: 2 //1为兑换支付成功2为预购成功
+			};
+		},
+		onLoad(opt) {
+			// 保存订单号
+			// 	if ('type' in opt) {
+			// 		this.type = opt.type;
+			// 	}
+			// 	if (this.type == 1) {
+			// 		uni.setNavigationBarTitle({
+			// 			title: '兑换成功'
+			// 		});
+			// 	}
+			// 	if (this.type == 2) {
+			// 		uni.setNavigationBarTitle({
+			// 			title: '预约成功'
+			// 		});
+			// 	}
+		},
+		methods: {}
+	};
 </script>
 
 <style lang="scss">
-.content {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-}
-.success-icon {
-	margin-top: 100rpx;
-	width: 302rpx;
-	height: 320rpx;
-}
-.tit {
-	margin-top: 40rpx;
-	font-size: 32rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #333333;
-}
-.btn-group {
-	padding-top: 130rpx;
-	display: flex;
-	justify-content: flex-start;
-}
-.mix-btn {
-	margin-top: 30upx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 301rpx;
-	height: 78rpx;
-	background: #08d29b;
-	border-radius: 10rpx;
-	font-size: $font-lg;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	&.hollow {
-		margin-left: 36rpx;
-		background: #fff;
-		color: #08d29b;
-		border: 1px solid #08d29b;
+	page,.content {
+		height: 100%;
+		width: 750rpx;
+		background: #040404;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.success-icon {
+		margin-top: 100rpx;
+		width: 302rpx;
+		height: 320rpx;
+	}
+
+	.tit {
+		margin-top: 40rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
+	}
+
+	.btn-group {
+		padding-top: 130rpx;
+		display: flex;
+		justify-content: flex-start;
+	}
+
+	.mix-btn {
+		// margin-top: 30upx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 301rpx;
+		height: 78rpx;
+		// background: #08d29b;
+		border-radius: 10rpx;
+		font-size: $font-lg;
+
+		border: 2rpx solid #A581FF;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #A581FF;
+		// &.hollow {
+		// 	margin-left: 36rpx;
+		// 	background: #fff;
+		// 	color: #08d29b;
+		// 	border: 1px solid #08d29b;
+		// }
 	}
-}
 </style>

pages/money/recharge.vue

@@ -10,10 +10,12 @@
 		<view class="cz_box">
 			<view class="cz_wrap">
 				<text class="cz_tit">￥</text>
-				<input class="cz_input" type="number" v-model="money" @focus="changeNum()" placeholder="请输入充值金额" placeholder-class="placeholder" />
+				<input class="cz_input" type="number" v-model="money" @focus="changeNum()" placeholder="请输入充值金额"
+					placeholder-class="placeholder" />
 			</view>
 			<view class="zc_list_box">
-				<view class="zc_list_price" :class="{ seletPrice: seletNum == item.price }" @click="seletChange(item, index)" v-for="(item, index) in list" :key="index">
+				<view class="zc_list_price" :class="{ seletPrice: seletNum == item.price }"
+					@click="seletChange(item, index)" v-for="(item, index) in list" :key="index">
 					{{ item.price | parseFloatNum }}元
 				</view>
 			</view>
@@ -40,446 +42,535 @@
 				<view class="icon iconfont iconweixin"></view>
 				<view class="tit">微信充值</view>
 			</view>
-			<view class="right"><radio value="weixin" color=" #EB001C" :checked="type == 'weixin'" /></view>
+			<view class="right">
+				<radio value="weixin" color=" #EB001C" :checked="type == 'weixin'" />
+			</view>
 		</view>
-		<button class="add-btn up" :class="{ 'active-bg': payLoding }" @click="!payLoding ? confirm() : ''">立即充值</button>
+		<button class="add-btn up" :class="{ 'active-bg': payLoding }"
+			@click="!payLoding ? confirm() : ''">立即充值</button>
+			
+			<!-- <view class="aaa">
+				<view class="bbb">
+					22222
+				</view>
+			</view> -->
 	</view>
 </template>
 
 <script>
-import { getMoneyStyle } from '@/utils/rocessor.js';
-// #ifdef H5
-import { rechargeWechat, rechargeIndex } from '@/api/wallet.js';
-// #endif
-// #ifdef MP
-import { rechargeWechat, rechargeRoutine, rechargeIndex } from '@/api/wallet.js';
-// #endif
-import { mapState } from 'vuex';
-import { spreadCommission, userBalance,moneyChong } from '@/api/wallet.js';
-export default {
-	filters: {
-		getMoneyStyle,
-		// 去处小数点后的0
-		parseFloatNum(clock) {
-			return parseFloat(clock);
-		}
-	},
-	data() {
-		return {
-			type: 'weixin',
-			money: '', //充值金额
-			payLoding: false ,//是否加载中
-			list: [
-				'300',
-				'200',
-				'150',
-				'100',
-				'50'
-			],
-			now_money:'',
-			seletNum: '300',	// 选中
-			zhuyi: [],
-			quota: '',	// 送的钱
-			typeText: 0,	// 0-微信 1-佣金
-		};
-	},
-	onLoad(options) {
-		this.loadData();
-	},
-	computed: {
-		// #ifdef H5
-		...mapState(['weichatObj', 'userInfo'])
-		// #endif
-		// #ifdef MP
-		...mapState(['userInfo'])
-		// #endif
-	},
-	methods: {
-		// 跳转
-		navTo(url) {
-			uni.navigateTo({
-				url: url
-			});
-		},
-		changeNum() {
-			this.seletNum = this.money = '';
-			console.log(this.seletNum, this.money);
-		},
-		seletChange(item, index) {
-			this.seletNum = item.price;
-			this.seletMoney = item.price;
-			this.money = item.price
-		},
-		// 切换选中对象
-		tabRadio(e) {
-			this.type = e.detail.value;
-			if ( e.detail.value == 'weixin' ) {
-				this.typeText = 0
-			} else {
-				this.typeText = 1
+	import {
+		getMoneyStyle
+	} from '@/utils/rocessor.js';
+	// #ifdef H5
+	import {
+		rechargeWechat,
+		rechargeIndex
+	} from '@/api/wallet.js';
+	// #endif
+	// #ifdef MP
+	import {
+		rechargeWechat,
+		rechargeRoutine,
+		rechargeIndex
+	} from '@/api/wallet.js';
+	// #endif
+	import {
+		mapState
+	} from 'vuex';
+	import {
+		spreadCommission,
+		userBalance,
+		moneyChong
+	} from '@/api/wallet.js';
+	export default {
+		filters: {
+			getMoneyStyle,
+			// 去处小数点后的0
+			parseFloatNum(clock) {
+				return parseFloat(clock);
 			}
 		},
-		// 充值金额
-		rechargeXuan(item) {
-			this.money = item.price;
-			this.quota = item.quota;
+		data() {
+			return {
+				type: 'weixin',
+				money: '', //充值金额
+				payLoding: false, //是否加载中
+				list: [
+					'300',
+					'200',
+					'150',
+					'100',
+					'50'
+				],
+				now_money: '',
+				seletNum: '300', // 选中
+				zhuyi: [],
+				quota: '', // 送的钱
+				typeText: 0, // 0-微信 1-佣金
+			};
 		},
-
-		loadData() {
-			moneyChong({}).then(({data}) =>{
-				console.log(data,"123456789");
-				this.list = data.recharge_quota;
-			});
-			userBalance({}).then(({ data }) => {
-				this.now_money = data.now_money;
-			});
+		onLoad(options) {
+			this.loadData();
 		},
-
-		// 提交
-		confirm() {
-			let obj = this;
-			obj.payLoding = true;
-			if( !obj.money ) {
-				obj.$api.msg('请输入金额');
-				obj.payLoding = false;
-				return;
-			}
+		computed: {
 			// #ifdef H5
-			rechargeWechat({
-				price: this.money,
-				from: this.type ,
-			}).then(e => {
-					let da = e.data.data;
-					obj.weichatObj.chooseWXPay({
-						timestamp: da.timestamp,
-						nonceStr: da.nonceStr,
-						package: da.package,
-						signType: da.signType,
-						paySign: da.paySign,
-						success: function(res) {
-							uni.showToast({
-								title: '充值成功',
-								duration: 2000,
-								position: 'top',
-								success: function(res) {
-									uni.navigateBack()
-								}
-							});
-						}
-					});
-					obj.payLoding = false;
-				})
-				.catch(e => {
-					obj.payLoding = false;
-					console.log(e);
-				});
+			...mapState(['weichatObj', 'userInfo'])
 			// #endif
 			// #ifdef MP
-			rechargeRoutine({ price: this.money})
-				.then(e => {
-					let da = e.data;
-						wx.requestPayment({
-								timeStamp: da.timestamp,
-								nonceStr: da.nonceStr,
-								package: da.package,
-								signType: da.signType,
-								paySign: da.paySign,
-								success: function(res) {
-									uni.showToast({
-										title: '充值成功',
-										duration: 2000,
-										position: 'top',
-										success: function(res) {
-											uni.navigateBack()
-										}
-									});
-								},
-
-							})
-
-					obj.payLoding = false;
-				})
-				.catch(e => {
-					obj.payLoding = false;
-					console.log(e);
-				});
+			...mapState(['userInfo'])
 			// #endif
 		},
-	}
-};
+		methods: {
+			// 跳转
+			navTo(url) {
+				uni.navigateTo({
+					url: url
+				});
+			},
+			changeNum() {
+				this.seletNum = this.money = '';
+				console.log(this.seletNum, this.money);
+			},
+			seletChange(item, index) {
+				this.seletNum = item.price;
+				this.seletMoney = item.price;
+				this.money = item.price
+			},
+			// 切换选中对象
+			tabRadio(e) {
+				this.type = e.detail.value;
+				if (e.detail.value == 'weixin') {
+					this.typeText = 0
+				} else {
+					this.typeText = 1
+				}
+			},
+			// 充值金额
+			rechargeXuan(item) {
+				this.money = item.price;
+				this.quota = item.quota;
+			},
+
+			loadData() {
+				moneyChong({}).then(({
+					data
+				}) => {
+					console.log(data, "123456789");
+					this.list = data.recharge_quota;
+				});
+				userBalance({}).then(({
+					data
+				}) => {
+					this.now_money = data.now_money;
+				});
+			},
+
+			// 提交
+			confirm() {
+				let obj = this;
+				obj.payLoding = true;
+				if (!obj.money) {
+					obj.$api.msg('请输入金额');
+					obj.payLoding = false;
+					return;
+				}
+				// #ifdef H5
+				rechargeWechat({
+						price: this.money,
+						from: this.type,
+					}).then(e => {
+						let da = e.data.data;
+						obj.weichatObj.chooseWXPay({
+							timestamp: da.timestamp,
+							nonceStr: da.nonceStr,
+							package: da.package,
+							signType: da.signType,
+							paySign: da.paySign,
+							success: function(res) {
+								uni.showToast({
+									title: '充值成功',
+									duration: 2000,
+									position: 'top',
+									success: function(res) {
+										uni.navigateBack()
+									}
+								});
+							}
+						});
+						obj.payLoding = false;
+					})
+					.catch(e => {
+						obj.payLoding = false;
+						console.log(e);
+					});
+				// #endif
+				// #ifdef MP
+				rechargeRoutine({
+						price: this.money
+					})
+					.then(e => {
+						let da = e.data;
+						wx.requestPayment({
+							timeStamp: da.timestamp,
+							nonceStr: da.nonceStr,
+							package: da.package,
+							signType: da.signType,
+							paySign: da.paySign,
+							success: function(res) {
+								uni.showToast({
+									title: '充值成功',
+									duration: 2000,
+									position: 'top',
+									success: function(res) {
+										uni.navigateBack()
+									}
+								});
+							},
+
+						})
+
+						obj.payLoding = false;
+					})
+					.catch(e => {
+						obj.payLoding = false;
+						console.log(e);
+					});
+				// #endif
+			},
+		}
+	};
 </script>
 
 <style lang="scss">
-page {
-	height: 100%;
-	background: #ffffff;
-}
-.top_box {
-	padding: 20rpx 26rpx 20rpx 47rpx;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	.yue-tit {
-		font-size: 28rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #333333;
-	}
-	.yue-num {
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ff6f0f;
+	page {
+		height: 100%;
+		background: #111111;
+
 	}
-}
-
-.line_box {
-	width: 100%;
-	height: 20rpx;
-	background: #f8f8f8;
-}
-.cz_box {
-	padding: 40rpx 20rpx 20rpx;
-	.cz_wrap {
+
+	.top_box {
+		padding: 20rpx 26rpx 20rpx 47rpx;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding-bottom: 20rpx;
-		border-bottom: 1px solid #e6e6e6;
-		.cz_tit {
-			font-size: 32rpx;
+
+		.yue-tit {
+			font-size: 28rpx;
 			font-family: PingFang SC;
 			font-weight: 500;
+			color: #ffffff;
 		}
-		.cz_input {
-			text-align: right;
-			font-size: 32rpx;
+	
+	.yue-num {
+			font-size: 30rpx;
 			font-family: PingFang SC;
-			font-weight: 500;
-			// color: #BFBFBF;
+			font-weight: bold;
+			color: #A581FF;
 		}
 	}
-	.zc_list_box {
-		display: flex;
-		flex-wrap: wrap;
-		.zc_list_price {
-			width: 202rpx;
-			height: 60rpx;
-			background: #f0f0f0;
-			border-radius: 8rpx;
-			margin-top: 36rpx;
-			margin-right: 50rpx;
+
+	.line_box {
+		width: 100%;
+		height: 20rpx;
+		background: #1B1B1B;
+	}
+
+	.cz_box {
+		padding: 40rpx 20rpx 20rpx;
+
+		.cz_wrap {
 			display: flex;
 			align-items: center;
-			justify-content: center;
-			&:nth-child(3n) {
-				margin-right: 0;
+			justify-content: space-between;
+			padding-bottom: 20rpx;
+			border-bottom: 1px solid #e6e6e6;
+
+			.cz_tit {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.cz_input {
+				text-align: right;
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
 			}
 		}
-		.seletPrice {
-			background: linear-gradient(143.2747deg, #ff6a00, #ee0979);
-			color: #ffffff;
+
+		.zc_list_box {
+			display: flex;
+			flex-wrap: wrap;
+
+			.zc_list_price {
+				color: #ffffff;
+				width: 202rpx;
+				height: 60rpx;
+				background: #111111;
+				border-radius: 8rpx;
+				margin-top: 36rpx;
+				margin-right: 50rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				&:nth-child(3n) {
+					margin-right: 0;
+				}
+			}
+
+			.seletPrice {
+				background: linear-gradient(270deg, #6E8DF7, #9977F6);
+				color: #ffffff;
+			}
 		}
 	}
-}
-.recha-box {
-	padding: 50rpx 30rpx 0;
-	display: flex;
-	flex-wrap: wrap;
-	.recha-frame {
-		width: 210rpx;
-		height: 181rpx;
-		border: 1px solid #dbdede;
-		border-radius: 20rpx;
+
+	.recha-box {
+		padding: 50rpx 30rpx 0;
 		display: flex;
-		align-items: center;
-		flex-direction: column;
-		justify-content: center;
-		margin-right: 30rpx;
-		margin-bottom: 30rpx;
-		&:nth-child(3n) {
-			margin-right: 0;
-		}
-		.recha-top {
+		flex-wrap: wrap;
+
+		.recha-frame {
+			width: 210rpx;
+			height: 181rpx;
+			border: 1px solid #dbdede;
+			border-radius: 20rpx;
 			display: flex;
 			align-items: center;
-			.recha-img {
-				width: 64rpx;
-				height: 62rpx;
+			flex-direction: column;
+			justify-content: center;
+			margin-right: 30rpx;
+			margin-bottom: 30rpx;
+
+			&:nth-child(3n) {
+				margin-right: 0;
 			}
-			.recha-tit {
-				margin-left: 10rpx;
-				font-size: 36rpx;
+
+			.recha-top {
+				display: flex;
+				align-items: center;
+
+				.recha-img {
+					width: 64rpx;
+					height: 62rpx;
+				}
+
+				.recha-tit {
+					margin-left: 10rpx;
+					font-size: 36rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+			}
+
+			.recha-song {
+				margin-top: 20rpx;
+				font-size: $font-base;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #333333;
+				color: #ff9900;
 			}
 		}
-		.recha-song {
-			margin-top: 20rpx;
-			font-size: $font-base;
+
+		.select-frame {
+			border: 1px solid #ef041f;
+		}
+	}
+
+	.rechar-box {
+		padding: 30rpx 20rpx 0;
+
+		.rechar-title {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+			margin-bottom: 10rpx;
+		}
+
+		.rechar-text {
+			font-size: 28rpx;
 			font-family: PingFang SC;
 			font-weight: bold;
-			color: #ff9900;
+			color: #333333;
 		}
 	}
-	.select-frame {
-		border: 1px solid #ef041f;
-	}
-}
 
-.rechar-box {
-	padding: 30rpx 20rpx 0;
-	.rechar-title {
-		font-size: 32rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #333333;
-		margin-bottom: 10rpx;
-	}
-	.rechar-text {
-		font-size: 28rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #333333;
-	}
-}
-.cz-type {
-	margin-top: 22rpx;
-	display: flex;
-	justify-content: space-between;
-	padding: 32rpx;
-	align-items: center;
-	.type-left {
+	.cz-type {
+		margin-top: 22rpx;
 		display: flex;
+		justify-content: space-between;
+		padding: 32rpx;
 		align-items: center;
-		.icon {
-			height: 38rpx;
-			image {
-				width: 48rpx;
+
+		.type-left {
+			display: flex;
+			align-items: center;
+
+			.icon {
 				height: 38rpx;
+
+				image {
+					width: 48rpx;
+					height: 38rpx;
+				}
+			}
+
+			.iconweixin {
+				color: #36cb59;
+			}
+
+			.tit {
+				margin-left: 12rpx;
+				font-size: 30rpx;
+				color: #ffffff;
 			}
 		}
-		.iconweixin {
-			color: #36cb59;
-		}
-		.tit {
-			margin-left: 12rpx;
-			font-size: 30rpx;
-			color: #333333;
+
+		.type-right {
+			image {
+				width: 36rpx;
+				height: 36rpx;
+			}
 		}
 	}
-	.type-right {
-		image {
-			width: 36rpx;
-			height: 36rpx;
+
+	.add-btn {
+		&.modified {}
+
+		&.up {
+			color: #ffffff;
 		}
-	}
-}
-.add-btn {
-	&.modified {
-		
-	}
-	&.up {
-		color: #F21F5D;
-	}
-	margin-top: 100rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 604rpx;
-	height: 90rpx;
-	border: 2rpx solid #F21F5D;
-	border-radius: 10rpx;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #F21F5D;
-	line-height: 90rpx;
-	text-align: center;
-}
-.row-box {
-	margin-top: 30rpx;
-	padding: 20rpx 30rpx;
-	background: #fff;
-	.title {
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-	}
-	.row {
+
+		margin-top: 100rpx;
 		display: flex;
 		align-items: center;
-		position: relative;
-		height: 80rpx;
-		.tit {
-			flex-shrink: 0;
-			width: 40rpx;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.input {
-			flex: 1;
-			font-size: 30rpx;
+		justify-content: center;
+		width: 604rpx;
+		height: 90rpx;
+		// border: 2rpx solid #F21F5D;
+		border-radius: 10rpx;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #F21F5D;
+		line-height: 90rpx;
+		text-align: center;
+		background: linear-gradient(270deg, #6E8DF7, #9977F6);
+	}
+
+	.row-box {
+		margin-top: 30rpx;
+		padding: 20rpx 30rpx;
+		background: #fff;
+
+		.title {
+			font-size: $font-base + 2rpx;
 			color: $font-color-dark;
 		}
-		.iconlocation {
-			font-size: 36rpx;
-			color: $font-color-light;
-		}
 
-		.buttom {
-			color: $font-color;
-			font-size: $font-base;
+		.row {
+			display: flex;
+			align-items: center;
+			position: relative;
+			height: 80rpx;
+
+			.tit {
+				flex-shrink: 0;
+				width: 40rpx;
+				font-size: 30rpx;
+				color: $font-color-dark;
+			}
+
+			.input {
+				flex: 1;
+				font-size: 30rpx;
+				color: $font-color-dark;
+			}
+
+			.iconlocation {
+				font-size: 36rpx;
+				color: $font-color-light;
+			}
+
+			.buttom {
+				color: $font-color;
+				font-size: $font-base;
+			}
 		}
 	}
-}
-.list {
-	padding-left: 30rpx;
-	margin-top: 30rpx;
-	background-color: #ffffff;
-	.box {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 120rpx;
-		border-bottom: 1px solid $border-color-light;
-		padding-right: 25rpx;
-		.icon {
-			font-size: 48rpx;
-			padding-right: 20rpx;
+
+	.list {
+		padding-left: 30rpx;
+		margin-top: 30rpx;
+		background-color: #ffffff;
+
+		.box {
 			display: flex;
-		}
-		.yongjing {
-			width: 48rpx;
-			height: 48rpx;
-		}
-		.iconweixin1 {
-			color: #18bf16;
-		}
-		.iconzhifubao {
-			color: #08aaec;
-		}
-		.title-box {
-			flex-grow: 1;
-			text-align: left;
-			.title {
-				font-size: $font-base + 2rpx;
-				color: $font-color-base;
+			align-items: center;
+			width: 100%;
+			height: 120rpx;
+			border-bottom: 1px solid $border-color-light;
+			padding-right: 25rpx;
+
+			.icon {
+				font-size: 48rpx;
+				padding-right: 20rpx;
+				display: flex;
 			}
-			.node {
-				font-size: $font-sm;
-				color: $font-color-light;
+
+			.yongjing {
+				width: 48rpx;
+				height: 48rpx;
+			}
+
+			.iconweixin1 {
+				color: #18bf16;
 			}
+
+			.iconzhifubao {
+				color: #08aaec;
+			}
+
+			.title-box {
+				flex-grow: 1;
+				text-align: left;
+
+				.title {
+					font-size: $font-base + 2rpx;
+					color: $font-color-base;
+				}
+
+				.node {
+					font-size: $font-sm;
+					color: $font-color-light;
+				}
+			}
+		}
+	}
+
+	/deep/ .uni-radio-input {
+		width: 45rpx;
+		height: 45rpx;
+	}
+
+	.active-bg {
+		background: linear-gradient(143.2747deg, #ff6a00, #ee0979) !important;
+		color: #FFFFFF !important;
+	}
+	.aaa{
+		display: flex;
+		
+		width: 300rpx;height: 300rpx;
+		background: #fff;
+		.bbb{
+			width: 100rpx;height: 100rpx;
+			background: red;
 		}
 	}
-}
-/deep/ .uni-radio-input {
-	width: 45rpx;
-	height: 45rpx;
-}
-
-.active-bg {
-	background: linear-gradient(143.2747deg, #ff6a00, #ee0979) !important;
-	color: #FFFFFF !important;
-}
 </style>

pages/money/success.vue

@@ -0,0 +1,92 @@
+<template>
+	<view class="content">
+		<image class="success-icon" src="../../static/user/success.png" mode=""></image>
+		<text class="tit">提交成功</text>
+		<view class="btn-group">
+			<!-- <navigator url="/pages/order/order?state=1" open-type="redirect" class="mix-btn">查看订单</navigator> -->
+			<navigator url="/pages/index/index" open-type="switchTab" class="mix-btn hollow">返回首页</navigator>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				type: 2 //1为兑换支付成功2为预购成功
+			};
+		},
+		onLoad(opt) {
+			// 保存订单号
+			// 	if ('type' in opt) {
+			// 		this.type = opt.type;
+			// 	}
+			// 	if (this.type == 1) {
+			// 		uni.setNavigationBarTitle({
+			// 			title: '兑换成功'
+			// 		});
+			// 	}
+			// 	if (this.type == 2) {
+			// 		uni.setNavigationBarTitle({
+			// 			title: '预约成功'
+			// 		});
+			// 	}
+		},
+		methods: {}
+	};
+</script>
+
+<style lang="scss">
+	page,.content {
+		height: 100%;
+		width: 750rpx;
+		background: #040404;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.success-icon {
+		margin-top: 100rpx;
+		width: 260rpx;
+		height: 200rpx;
+	}
+
+	.tit {
+	font-size: 40rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	line-height: 40rpx;
+	}
+
+	.btn-group {
+		padding-top: 130rpx;
+		display: flex;
+		justify-content: flex-start;
+	}
+
+	.mix-btn {
+		// margin-top: 30upx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 301rpx;
+		height: 78rpx;
+		// background: #08d29b;
+		border-radius: 10rpx;
+		font-size: $font-lg;
+
+		border: 2rpx solid #A581FF;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #A581FF;
+		// &.hollow {
+		// 	margin-left: 36rpx;
+		// 	background: #fff;
+		// 	color: #08d29b;
+		// 	border: 1px solid #08d29b;
+		// }
+	}
+</style>

pages/money/wallet.vue

@@ -1,432 +1,192 @@
 <template>
 	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">我的余额</view>
-			</view>
-			<view class="content-bg"><image src="../../static/img/myyue.png" mode=""></image></view>
-			<view class="money-box">
-				<view class="money">{{money | getMoneyStyle}}</view>
-				<view>我的余额</view>
+		<view class="title-box">
+			<view class="yue-box">
+				<view class="yue-top">
+					我的余额(元)
+				</view>
+				<view class="yue-bottom">
+					40876.50
+				</view>
 			</view>
-			<view class="moneybtn-box">
-				<!-- <view class="money-btn" @click="navto('/pages/money/recharge')">
+			<view class="box">
+				<view class="cz" @click="navTo('/pages/money/recharge')">
 					充值
-				</view> -->
-				<view class="money-btn" @click="navto('/pages/money/withdmoenys?type=yue')">
-					转账
 				</view>
-				
+				<view class="cz" @click="navTo('/pages/money/withdrawal')">
+					提现
+				</view>
 			</view>
 		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{recharge}}</view>
+		<view class="center-box">
+			<view class="centet-left">
+				<view class="top">
+					56.00
+				</view>
+				<view class="bottom">
+					历史充值(元)
+				</view>
 			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{orderStatusSum}}</view>
+			<view class="" style="width: 2rpx;height: 54rpx;background: #EEEEEE;"></view>
+			<view class="centet-left">
+				<view class="top">
+					1256.00
+				</view>
+				<view class="bottom">
+					历史提现(元)
+				</view>
 			</view>
 		</view>
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		<view class="detail">
+			<view class="det-left">
+				<view class="det-top">
+					提现
+				</view>
+				<view class="det-bottom">
+					2021-11-11
+				</view>
+			</view>
+			<view class="det-right">
+				+1000
+			</view>
 		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-	
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<view class="title-box">
-								<view class="title">
-									<text>{{ item.title }}</text>
-								</view>
-								<view class="time">
-									<text>{{ item.add_time }}</text>
-								</view>
-							</view>
-							<view class="money">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-								<view v-if="item.status == 0" class="status">待发放</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
 	</view>
 </template>
 
 <script>
-import { spreadCommission, userBalance } from '@/api/wallet.js';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					_this.height = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			height: '',
-			// 头部图高度
-			maxheight:'',
-			tabCurrentIndex: 0,
-			orderStatusSum: 0,
-			recharge: 0,
-			navList: [
-				// {
-				// 	state: 0,
-				// 	text: '全部',
-				// 	loadingType: 'more',
-				// 	orderList: [],
-				// 	page: 1, //当前页数
-				// 	limit: 10 //每次信息条数
-				// },
-				{
-					state: 1,
-					text: '支出',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 2,
-					text: '收入',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}
-			],
-			money: ''
-		};
-	},
-	onLoad(options) {},
-	onShow() {
-		this.loadData();
-		// 获取用户余额
-		userBalance({}).then(({ data }) => {
-			this.money = data.now_money;
-		});
-	},
-	methods: {
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		//获取收入支出信息
-		async loadData(source) {
-			let obj = this
-			//这里是将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			let state = navItem.state;
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading') {
-				//防止重复加载
-				return;
-			}
-			// 修改当前对象状态为加载中
-			navItem.loadingType = 'loading';
+	export default {
+		data() {
+			return {
 
-			spreadCommission(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				state
-			)
-				.then(({ data }) => {
-					// console.log(data[0],'1');
-					// console.log(JSON.stringify(data),'2')
-					
-					// obj.recharge = data.income;
-					// obj.orderStatusSum = data.expend;
-					if (data[0].list.length > 0) {
-						console.log(data[0].list,'data.list[0]');
-						navItem.orderList = navItem.orderList.concat(data[0].list);
-						console.log(navItem.orderList,'navItem.orderList');
-						navItem.page++;
-					}else {
-						navItem.loadingType = 'noMore';
-						console.log('还有税局2');
-					}
-					if (navItem.limit == data[0].list.length) {
-						console.log(navItem.limit == data[0].list.length,'还有税局');
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'more';
-						return;
-					} else {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'noMore';
-					}
-					uni.hideLoading();
-					this.$set(navItem, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
+			};
 
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
 		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
+		methods: {
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
 		}
 	}
-};
 </script>
 
 <style lang="scss">
-page {
-	background: #f1f1f1;
-	height: 100%;
-}
-.status_bar {
-	height: var(--status-bar-height);
-	width: 100%;
-}
-.content-money {
-	position: relative;
-	height: 480rpx;
-	.content-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
+	page,
+	.content {
+		height: 100%;
 		width: 750rpx;
-		height: 480rpx;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.body-title {
-		height: 80rpx;
-		text-align: center;
-		font-size: 35rpx;
-		position: relative;
-		.header {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fffeff;
-			height: 80rpx;
-			font-size: 36rpx;
-			font-weight: 700;
-			z-index: 9;
+		background: #111111;
+
+		.title-box {
+			padding-left: 30rpx;
+			margin-top: 100rpx;
 			display: flex;
-			justify-content: center;
+			justify-content: space-between;
 			align-items: center;
+
+			.yue-box {
+				display: flex;
+				flex-direction: column;
+
+				.yue-top {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+				}
+
+				.yue-bottom {
+					font-size: 60rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #A581FF;
+				}
+			}
+
+			.box {
+
+				.cz {
+					margin: 20rpx 0;
+					text-align: center;
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #FFFFFF;
+					width: 140rpx;
+					height: 64rpx;
+					border: 2rpx solid #FFFFFF;
+					border-radius: 32rpx 0px 0px 32rpx;
+					line-height: 64rpx;
+				}
+			}
 		}
-		.goback-box {
-			position: absolute;
-			left: 18rpx;
-			top: 0;
-			height: 80rpx;
+
+		.center-box {
 			display: flex;
+			justify-content: space-around;
 			align-items: center;
-		}
+			margin: 30rpx 25rpx;
+			height: 120rpx;
+			background: #181818;
+			border-radius: 10rpx;
 
-		.goback {
-			z-index: 100;
-			width: 34rpx;
-			height: 34rpx;
-		}
-	}
-}
-.info-box {
-	width: 670rpx;
-	height: 186rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: -100rpx auto 0;
-	position: relative;
-	z-index: 2;
-	.info-item {
-		width: 50%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		line-height: 1;
-		.info-font {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #999999;
-		}
-		.info-num {
-			margin-top: 30rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #181818;
+			.centet-left {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+			}
+
+			.top {
+				font-size: 32rpx;
+				font-weight: 400;
+				color: #FFFFFF;
+				line-height: 48rpx;
+			}
+
+			.bottom {
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				line-height: 48rpx;
+			}
 		}
 	}
-	.shu {
-		width: 2rpx;
-		height: 74rpx;
-		background: #dcdfe6;
-	}
-}
-.money-box {
-	position: relative;
-	z-index: 2;
-	padding-top: 70rpx;
-	color: #ffffff;
-	text-align: center;
-	.money {
-		font-size: 72rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-	.text {
-		font-size: 30rpx;
-	}
-}
-.moneybtn-box {
-	display: flex;
-	justify-content: space-between;
-	position: relative;
-	z-index: 2;
-	color: #ffffff;
-	padding:20rpx 50rpx ;
-	font-size: 30rpx;
-	margin-top: -40rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #FFFFFF;
-}
 
-.navbar {
-	margin-top: 20rpx;
-	display: flex;
-	height: 88rpx;
-	padding: 0 5px;
-	background: #fff;
-	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-	position: relative;
-	z-index: 10;
-	.nav-item {
-		flex: 1;
+	.detail {
 		display: flex;
-		justify-content: center;
+		height: 120rpx;
+		justify-content: space-between;
 		align-items: center;
-		height: 100%;
-		font-size: 15px;
-		color: #999999;
-		position: relative;
-		&.current {
-			color: #000;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #fe5b38;
-			}
-		}
-	}
-}
-//列表
-.swiper-box {
-	.order-item:last-child {
-		margin-bottom: 60rpx;
-	}
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
+		border-bottom: 1rpx solid #F0F0F0;
+		margin: 0 25rpx;
+
+		.det-left {
+			display: flex;
+			flex-direction: column;
+
+			.det-top {
+				line-height: 40rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
 			}
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
+
+			.det-bottom {
+				line-height: 40rpx;
+				font-size: 22rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #999999;
 			}
 		}
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-			text-align: right;
-			.status {
-				color: $font-color-light;
-			}
+
+		.det-right {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #A581FF;
 		}
 	}
-}
-.list-scroll-content {
-	background: #ffffff;
-	height: 100%;
-}
-.content {
-	height: 100%;
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-.btn-box {
-	width: 674rpx;
-	height: 88rpx;
-	background: linear-gradient(0deg, #2e58ff, #32c6ff);
-	border-radius: 44rpx;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	text-align: center;
-	line-height: 88rpx;
-	position: fixed;
-	bottom: 48rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-}
 </style>

pages/money/withdrawal.vue

@@ -1,463 +1,213 @@
 <template>
 	<view class="content">
-		<!-- <uni-notice-bar single="true" text="实际到账98%"></uni-notice-bar> -->
-		<view class="content-money">
-			<view class="flex " style="width: 750rpx;justify-content: space-around;margin-left: 0;">
-				<view class="buttom">
-					<view class="icon">{{ money | getMoneyStyle }}</view>
-					<text class="text">可提现{{ showType }}</text>
-				</view>
+		<view class="tixian-box">
+			<view class="tixian-left">
+				可提现金额
 			</view>
-		</view>
-
-		<view class="row-box">
-			<view class="title">提现金额</view>
-			<view class="row">
-				<text class="tit">￥</text>
-				<input class="input" type="number" v-model="withdrawal" placeholder="请输入提现金额" placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = money">全部提现</view>
+			<view class="tixian-right">
+				<span style="font-size: 30rpx;">¥</span>1111<span>{{userInfo.money}}</span>
 			</view>
-			<view class="tip" v-if="withdrawal != 0">提现手续费{{ (withdrawal * 0.05 + 5).toFixed(6) * 1 }},可用阳光抵扣，当前阳光数量{{ userInfo.purple_integral }}</view>
 		</view>
-		<!-- #ifndef MP-WEIXIN -->
-		<view class="list">
-			<radio-group @change="tabRadio">
-				<!-- <label>
-					<view class="box">
-						<view class="icon iconfont iconweixin1"></view>
-						<view class="title-box">
-							<view class="title"><text>提现至微信</text></view>
-						</view>
-						<view class="right"><radio value="weixin" color="#5dbc7c" :checked="type == 'weixin'" /></view>
-					</view>
-				</label> -->
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconzhifubao"></view>
-						<view class="title-box">
-							<view class="title">
-								<text v-if="aliData.fullname">提现至支付宝</text>
-								<text v-else>请创建支付宝账号</text>
-							</view>
-							<view class="node">
-								<text v-if="aliData.fullname">真实姓名({{ aliData.fullname }})</text>
-							</view>
-						</view>
-						<view class="right"><radio value="alipay" color="#ff0060" :checked="type == 'alipay'" /></view>
-					</view>
-				</label>
-				<label>
-					<view class="box">
-						<view class="icon iconfont"><image class="icon-img" src="/static/icon/i8.png" mode="aspectFit"></image></view>
-						<view class="title-box">
-							<view class="title">
-								<text v-if="bankData.bankno">{{ bankData.bank + ' ' + bankData.bankno }}</text>
-								<text v-else>请创建银行账号</text>
-							</view>
-							<view class="node">
-								<text v-if="bankData.fullname">真实姓名({{ bankData.fullname }})</text>
-							</view>
-						</view>
-						<view class="right"><radio value="bank" color="#ff0060" :checked="type == 'bank'" /></view>
-					</view>
-				</label>
-			</radio-group>
-		</view>
-		<!-- #endif -->
-		<view class="row b-b" v-if="type == 'alipay'">
-			<text class="tit">支付宝账号</text>
-			<input class="input" type="text" v-model="alipay_code" placeholder="请输入支付宝账号" placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b" v-if="type == 'alipay'">
-			<text class="tit">支付宝姓名</text>
-			<input class="input" type="text" v-model="alipay_name" placeholder="请输入支付宝姓名" placeholder-class="placeholder" />
+		<view class="tixian-box">
+			<view class="tixian-left">
+				申请提现金额
+			</view>
+			<view class="tixian-right">
+				<span style="font-size: 30rpx;">¥</span><input type="number" class="input" v-model="txMoney">
+			</view>
 		</view>
-		<view class="row b-b" v-if="type == 'bank'">
-			<text class="tit">银行卡号</text>
-			<input class="input" type="text" v-model="bank_code" placeholder="请输入银行卡号" placeholder-class="placeholder" />
+		<view class="all" @click="tiX">
+			全部提现
 		</view>
-		<view class="row b-b" v-if="type == 'bank'">
-			<text class="tit">姓名</text>
-			<input class="input" type="text" v-model="bank_people" placeholder="请输入银行卡姓名" placeholder-class="placeholder" />
+		<view class="center">
+
 		</view>
-		<view class="row b-b" v-if="type == 'bank'">
-			<text class="tit">所属银行</text>
-			<input class="input" type="text" v-model="bank_name" placeholder="请输入所属银行" placeholder-class="placeholder" />
+		<view class="chooseZh-box">
+			<view class="chooseZh-title">
+				提现到
+			</view>
+			<view class="chooseZh-content">
+				<radio-group name="" class="chooseZh-content">
+					<label class="label">
+						<view class="cont-cont">
+							<image src="../../static/img/weixin.png" mode=""></image>
+							<text class="zf">微信支付</text>
+						</view>
+						<radio :value="weixin" style="transform:scale(0.8);color: #A581FF;" />
+					</label>
+					<label class="label">
+						<view class="cont-cont">
+							<image src="../../static/img/bank.png" mode=""></image>
+							<text class="zf">银行账号</text>
+						</view>
+						<radio :value="bank" style="transform:scale(0.8);color: #A581FF;" />
+					</label>
+				</radio-group>
+				<button class="button" >提交申请</button>
+			</view>
 		</view>
-		<button class="add-btn up" @click="confirm" :class="{ loading: load }">提交申请</button>
-		<!-- <button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/money/account')">账号管理</button> -->
 	</view>
 </template>
 
 <script>
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import { extractCash, extractBank, aliInfo, bankInfo, getMoneyType } from '@/api/wallet.js';
-import { orderData, getUserInfo } from '@/api/user.js';
-import { mapState, mapMutations } from 'vuex';
-import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
-export default {
-	filters: {
+	import {
 		getMoneyStyle
-	},
-	components: {
-		uniNoticeBar
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	data() {
-		return {
-			load: true,
-			showType: '',
-			from: '',
-			type: 'alipay', //提现方式
-			money: '0.00', //可提现金额
-			freeze: '0.0', //冻结金额
-			withdrawal: '', //提现金额
-			minPrice: '', //最少提现金额
-			aliData: {},
-			bankData: {},
-			alipay_code: '',
-			alipay_name: '',
-			bank_code: '',
-			bank_people: '',
-			bank_name: '',
-			// #ifdef H5
-			weichatBsrowser: false
-			// #endif
-		};
-	},
-	onLoad(options) {
-		// #ifdef H5
-		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
-		// #endif
-		if (options.type) {
-			this.from = options.type;
-			if (this.from == 'purple') {
-				this.showType = '肥料';
-			}
-			if (this.from == 'shop') {
-				this.showType = '商家积分';
-			}
-		}
-		//加载提现信息
-		this.loadData();
-		// // 加载提款账号信息
-		// this.loadAli();
-		// this.loadBank();
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		// 加载余额信息
-		async loadData() {
-			let obj = this;
-			aliInfo().then(e => {
-				console.log(e, 'eeee');
-				obj.alipay_code = e.data.zfb.payment;
-				obj.alipay_name = e.data.zfb.name;
-				obj.alipay_phone = e.data.zfb.phone;
-				obj.bank_code = e.data.bank.payment;
-				obj.bank_people = e.data.bank.name;
-				obj.bank_name = e.data.bank.bank;
-			});
-			getUserInfo({})
-				.then(({ data }) => {
-					console.log(data);
-					this.setUserInfo(data);
-					if (obj.from == 'purple') {
-						obj.money = data.white_integral;
-					}
-					if (obj.from == 'shop') {
-						obj.money = data.business_integral;
-					}
-					obj.load = false;
-				})
-				.catch(e => {
-					console.log(e);
-				});
+	} from '@/utils/rocessor.js';
+	import {
+		extractCash,
+		extractBank,
+		aliInfo,
+		bankInfo,
+		getMoneyType
+	} from '@/api/wallet.js';
+	import {
+		orderData,
+		getUserInfo
+	} from '@/api/user.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
+	export default {
+
+		components: {
+			uniNoticeBar
 		},
-		// 跳转
-		navTo(url) {
-			uni.navigateTo({
-				url: url
-			});
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 		},
-		// 切换选中对象
-		tabRadio(e) {
-			this.type = e.detail.value;
-		},
-		// 提交
-		confirm() {
-			if (this.load) {
-				return;
-			}
-			let data = {
-				extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
-				money: this.withdrawal, //金额
-				type: this.from == 'purple' ? 1 : 2 //0佣金1余额  1紫积分 2商家积分
-			};
-			if (this.withdrawal % 100 != 0) {
-				uni.showToast({
-					title: '提现金额为100的倍数',
-					duration: 2000,
-					mask: false,
-					icon: 'none'
-				});
-				return;
-			}
-			if (this.withdrawal < this.minPrice) {
-				uni.showToast({
-					title: '提现金额不可少于' + this.minPrice,
-					duration: 2000,
-					mask: false,
-					icon: 'none'
-				});
-				return;
-			}
-			if (this.type == 'alipay') {
-				console.log('alipay');
-				data.name = this.alipay_name;
-				data.alipay_code = this.alipay_code;
-			}
-			if (this.type == 'bank') {
-				data.name = this.bank_people;
-				data.bankname = this.bank_name;
-				data.cardnum = this.bank_code;
-			}
-			let zfbData = {
-				type: 2,
-				payment: this.alipay_code,
-				name: this.alipay_name
-			};
-			let bankData = {
-				type: 3,
-				payment: this.bank_code,
-				name: this.bank_people,
-				bank: this.bank_name
+		data() {
+			return {
+				txMoney: 0, //提现金额
+				weixin: "",
+				bank: "",
+
 			};
-			let scdata = '';
-			if (this.type == 'bank') {
-				scdata = bankData;
-			}
-			if (this.type == 'alipay') {
-				scdata = zfbData;
+		},
+		onLoad(options) {
+			console.log(this.userInfo, 'wwww');
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			//全部提现
+			tiX() {
+				this.txMoney = this.userInfo.money
 			}
-			this.load = true;
-			getMoneyType(scdata)
-				.then(e => {
-					console.log(e, 'eeeeee');
-					this.$api.prePage().dataUp();
-				})
-				.catch(e => {
-					console.log(e);
-				});
-			extractCash(data)
-				.then(e => {
-					this.loadData();
-					uni.showToast({
-						title: '提交成功',
-						duration: 2000,
-						position: 'top'
-					});
-				})
-				.catch(e => {
-					this.load = false;
-					console.log();
-				});
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	height: 100%;
-}
-
-.content-money {
-	padding: 30rpx 0;
-	background: #ffffff;
-}
-
-.flex {
-	background-color: #ffffff;
-	text-align: center;
-	margin: 0 30rpx;
-	border-radius: $border-radius-sm;
-
-	.buttom {
-		font-size: $font-lg;
-		width: 50%;
+	page,
+	.content {
+		width: 750rpx;
+		height: 100%;
+		background: #222222;
 	}
 
-	.interval {
-		width: 2px;
-		height: 60rpx;
-		background-color: #eeeeee;
-	}
-
-	.icon {
-		background-size: 100%;
-		font-size: 42rpx;
-		color: $font-color-dark;
-		font-weight: bold;
-		background-repeat: no-repeat;
-		background-position: center;
-	}
-
-	.text {
-		color: $font-color-light;
-	}
-}
-
-.row-box {
-	margin-top: 30rpx;
-	padding: 20rpx 30rpx;
-	background: #fff;
-
-	.title {
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-	}
-
-	.row {
+	.tixian-box {
 		display: flex;
+		justify-content: space-between;
 		align-items: center;
-		position: relative;
-		height: 80rpx;
+		margin: 0 30rpx;
+		border-bottom: 1rpx solid #e6e6e6;
+		height: 100rpx;
 
-		.tit {
-			flex-shrink: 0;
-			width: 40rpx;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
 
-		.input {
-			flex: 1;
-			font-size: 30rpx;
-			color: $font-color-dark;
+		.tixian-left {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 80rpx;
 		}
 
-		.iconlocation {
-			font-size: 36rpx;
-			color: $font-color-light;
-		}
-
-		.buttom {
-			color: #ff0060;
-			font-size: $font-base;
+		.tixian-right {
+			width: 200rpx;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+
+			font-size: 32px;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 80rpx;
+
+			.input {
+				margin-left: 5rpx;
+				width: 200rpx;
+				font-size: 32px;
+				font-family: SourceHanSansCN;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 80rpx;
+			}
 		}
 	}
-}
 
-.add-btn {
-	&.modified {
-		color: #ffffff;
+	.all {
+		font-size: 26rpx;
+		font-family: Adobe Heiti Std;
+		font-weight: normal;
+		color: #A581FF;
+		line-height: 42rpx;
+		display: flex;
+		justify-content: end;
+		margin: 20rpx 30rpx;
 	}
 
-	&.up {
-		background: linear-gradient(90deg, #ff0060, #ff0060);
-		color: #fff;
+	.center {
+		width: 750rpx;
+		height: 20rpx;
+		background: #181818;
+		margin-bottom: 30rpx;
 	}
 
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	margin: 0 auto;
-	margin-top: 30rpx;
-	font-size: $font-lg;
-	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
-
-.list {
-	padding-left: 30rpx;
-	margin-top: 30rpx;
-	background-color: #ffffff;
-
-	.box {
+	.chooseZh-content {
 		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 120rpx;
-		border-bottom: 1px solid $border-color-light;
-
-		.icon {
-			font-size: 48rpx;
-			padding-right: 20rpx;
-
-			.icon-img {
-				height: 50rpx;
-				width: 50rpx;
-			}
-		}
-
-		.iconweixin1 {
-			color: #18bf16;
+		flex-direction: column;
+		margin: 0 20rpx;
+		
+
+		.label {
+			display: flex;
+			justify-content: space-between;
+				align-items: center;
+				padding: 0 0 0 20rpx;
+			border-bottom: 1rpx solid #e6e6e6;
 		}
 
-		.iconzhifubao {
-			color: #08aaec;
-		}
-
-		.title-box {
-			flex-grow: 1;
-			text-align: left;
+		.cont-cont {
+			height: 100rpx;
+			display: flex;
+			align-items: center;
 
-			.title {
-				font-size: $font-base + 2rpx;
-				color: $font-color-base;
+			// justify-content: space-between;
+			image {
+				width: 40rpx;
+				height: 40rpx;
 			}
 
-			.node {
-				font-size: $font-sm;
-				color: $font-color-light;
+			.zf {
+				margin-left: 10rpx;
+				font-size: 26rpx;
+				font-family: SourceHanSansCN;
+				font-weight: 400;
+				color: #FFFFFF;
 			}
-		}
-	}
-}
 
-/deep/ .uni-radio-input {
-	width: 45rpx;
-	height: 45rpx;
-}
-
-.row {
-	display: flex;
-	align-items: center;
-	position: relative;
-	padding: 0 30upx;
-	height: 110upx;
-	background: #fff;
-
-	.tit {
-		flex-shrink: 0;
-		width: 250upx;
-		font-size: 30upx;
-		color: $font-color-dark;
-	}
-
-	.input {
-		flex: 1;
-		font-size: 30upx;
-		color: $font-color-dark;
+		}
 	}
-
-	.iconlocation {
-		font-size: 36upx;
-		color: $font-color-light;
+	.button{
+		margin-top: 80rpx;
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 88rpx;
+		width: 670rpx;
+		height: 88rpx;
+		background: linear-gradient(270deg, #6E8DF7, #9977F6);
+		border-radius: 10rpx;
 	}
-}
-
-.tip {
-	padding: 20rpx;
-	color: #fd3b39;
-}
-
-.loading {
-	background: #999;
-}
 </style>

pages/product/product.vue

@@ -1,762 +1,538 @@
 <template>
 	<view class="container">
-		<!-- 轮播图 -->
-		<top-swiper :imgList="imgList"></top-swiper>
-		<!-- 标题 -->
-		<product-content :goodsObjact="goodsObjact"></product-content>
-		<view class="c-list">
-			<view class="c-row b-b" @click="toggleSpec">
-				<text class="tit">购买数量</text>
-				<view class="con">
-					<text class="selected-text">{{ goodsNumber }}</text>
+		<view class="swiper-box">
+			<view class="img">
+				<image :src="shopDetail.image" mode=""></image>
+			</view>
+		</view>
+		<view class="content-box">
+			<view class="content-top">
+				<view class="hd">
+					{{shopDetail.store_name}}
+				</view>
+				<view class="content-img">
+					<image src="../../static/img/fx.png" mode=""></image>分享
 				</view>
-				<text class="iconfont iconenter"></text>
 			</view>
-			<!-- <view class="c-row b-b" v-if="goodsObjact.white_integral != 0">
-				<text>每购买一个送{{ goodsObjact.white_integral }}肥料</text>
+			<view class="content-center">
+				<view class="title">
+					发行数量: {{shopDetail.ficti+shopDetail.stock}}份
+				</view>
+				<view class="title">
+					已售数量: {{shopDetail.ficti}}份
+				</view>
 			</view>
-			<view class="c-row b-b" v-if="goodsObjact.give_integral != 0">
-				<text>每购买一个送{{ goodsObjact.give_integral }}商城积分</text>
+			<view class="content-bottom">
+				<view class="price">
+					{{shopDetail.price}} <span>RMB</span>
+				</view>
+				<view class="gobuy" @click="buy()">
+					立即购买
+				</view>
 			</view>
-			<view class="c-row b-b" v-if="goodsObjact.business_integral != 0">
-				<text>每购买一个送{{ goodsObjact.business_integral }}商家积分</text>
-			</view> -->
 		</view>
-		<!-- 拼货时间及优惠 -->
-		<!-- <discounts @clickCoupon="Getcoupon" :Info="goodsObjact.store_info" :showCoupon="true"></discounts> -->
-		<!-- 评价 -->
-		<estimate @navTo="navTo('/pages/product/reply?id=' + goodsid)" v-if="reply" :reply="reply" :list="list"></estimate>
-		<!-- 规格信息 -->
-		<fresh-detail :goodsObjact="goodsObjact"></fresh-detail>
-		<!-- 图文详情 -->
-		<content-text :description="description"></content-text>
-		<!-- 底部高度撑开 -->
-		<view class="contentBottomHeight"></view>
-		<!-- 底部操作菜单 -->
-		<product-bottom @buy="buy" :goodsObjact="goodsObjact" :goodsid="goodsid" @specOPne="specOPne"></product-bottom>
-		<!-- 规格-模态层弹窗 -->
-		<view class="popup spec" :class="specClass" @touchmove.stop.prevent="stopPrevent" @click="toggleSpec">
-			<!-- 遮罩层 -->
-			<view class="mask"></view>
-			<view class="layer attr-content" @click.stop="stopPrevent">
-				<view class="a-t">
-					<image :src="actionImage"></image>
+		<!-- <view class="rz">
+			<view class="rz-title">
+				认证信息
+			</view>
+			<view class="rz-content">
+				<view class="con-box">
+					<view class="left">
+						合约地址
+					</view>
+					<view class="right">
+						<view class="address">
+							qwoeijwoqjeoiqwjeiqwqjwijeowqjeoqwhiqwjeoqj
+						</view>
+						<view class="copy">
+							<image src="../../static/img/copy.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+				<view class="con-box">
+					<view class="left">
+						TokenID
+					</view>
 					<view class="right">
-						<view class="good-name clamp">{{ goodsObjact.store_name }}</view>
-						<text class="price" v-if="actionIntegral != 0">¥{{ actionPrice }}+{{ actionIntegral }}阳光</text>
-						<text class="price" v-else>¥{{ actionPrice }}</text>
-						<!-- <text class="stock">库存：{{ goodsObjact.stock }}件</text> -->
-						<!-- <view class="selected" v-if="goodsType == 0">
-							已选：
-							<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem }}</text>
-						</view> -->
+						<view class="address">
+							18252757278
+						</view>
+						<view class="copy">
+							<image src="../../static/img/copy.png" mode=""></image>
+						</view>
 					</view>
 				</view>
-				<view v-for="(item, index) in specList" :key="index" class="attr-list">
-					<text>{{ item.attr_name }}</text>
-					<view class="item-list">
-						<text
-							v-for="(childItem, childIndex) in item.attr_value"
-							:key="childIndex"
-							class="tit"
-							:class="{ selected: childItem.check }"
-							@click="selectSpec(childItem, item, index)"
-						>
-							{{ childItem.attr }}
-						</text>
+				<view class="con-box">
+					<view class="left">
+						认证编号
+					</view>
+					<view class="right">
+						<view class="address">
+							#2501/2500
+						</view>
 					</view>
 				</view>
-				<view class="flex">
-					<view>购买数量</view>
-					<view class="item-list">
-						<uni-number-box class="step" :isMin="true" :value="goodsNumber" :min="1" :max="goodsNumberMax" @eventChange="numberChange"></uni-number-box>
+				<view class="con-box">
+					<view class="left">
+						认证网络
+					</view>
+					<view class="right">
+						<view class="address">
+							蚂蚁链
+						</view>
 					</view>
 				</view>
-				<button class="btn" @click.stop="buy">确定</button>
 			</view>
+		</view> -->
+		<view class="rz">
+			<view class="rz-title">
+				作品描述
+			</view>
+			<view class="rz-ms">
+				{{shopDetail.store_info}}
+			</view>
+		</view>
+		<view class="rz">
+			<view class="rz-title">
+				作品详情
+			</view>
+			<rich-text :nodes="shopDetail.description"></rich-text>
+
 		</view>
+		<uni-popup ref="popupkf" type="bottom">
+			<view class="popup-box">
+				<view class="pop-title">
+					选择支付方式
+				</view>
+				<view class="pop-radio">
+					<radio-group name="">
+						<label class="pop-radio-box">
+							<view class="pop-radio-cont">
+								<image src="../../static/img/weixin.png" style="width: 40rpx;height: 40rpx;" mode="">
+								</image>
+								<text>微信支付</text>
+							</view>
+							<radio :value="weixin" :checked="type=='weixin'" style="transform: scale(0.8);" />
+						</label>
+						<label class="pop-radio-box">
+							<view class="pop-radio-cont">
+								<image src="../../static/img/yue.png" style="width: 40rpx;height: 40rpx;" mode="">
+								</image>
+								<text>余额支付</text>
+							</view>
+							<radio :value="yue" :checked="type=='yue'" style="transform: scale(0.8);" />
+						</label>
+					</radio-group>
+					<view class="pop-bottom">
+						<view class="pirce">
+							<view class="price-left">
+								合计:
+							</view>
+							<view class="price-right">
+								￥<span>{{shopDetail.price}}</span>
+							</view>
+						</view>
+						<view class="buy">
+							立即支付
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- <uni-popup ref="popupZf" type="bottom" >
+			
+		</uni-popup> -->
 	</view>
 </template>
 
 <script>
-import uniNumberBox from '@/components/uni-number-box.vue';
-import { goodsDetail, cartAdd } from '@/api/product.js';
-import { mapState } from 'vuex';
-import store from '@/store/index.js';
-import { orderData, userinfo } from '@/api/user.js';
-import { saveUrl } from '@/utils/loginUtils.js';
-// #ifdef H5
-import { weixindata, shareLoad } from '@/utils/wxAuthorized';
-// #endif
-// 头部轮播图
-import topSwiper from './common/topSwiper.vue';
-// 标题
-import productContent from './common/productContent.vue';
-// 到货时间及优惠
-import discounts from './common/discounts.vue';
-// 规格信息
-import freshDetail from './common/freshDetail.vue';
-// 图文详情
-import contentText from './common/contentText.vue';
-// 底部按钮
-import productBottom from './common/productBottom.vue';
-// 猜你喜欢
-import guessLike from './common/guessLike.vue';
-// 评价
-import estimate from './common/estimate.vue';
-export default {
-	components: {
-		uniNumberBox,
-		guessLike,
-		topSwiper,
-		productContent,
-		discounts,
-		freshDetail,
-		contentText,
-		productBottom,
-		estimate
-	},
-	data() {
-		return {
-			goodsStore: 0, //选中库存
-			specList: [],
-			buys_show: true,
-			buys_shows: false,
-			specSelected: [], //选中的分类
-			specClass: 'none', //显示隐藏弹窗
-			many: 1, //1是单规格  2是多规格
-			reply: '', //评论
-			list: '', //商品详情的数据
-			type: 1, //默认支付方式add为
-			goodsType: 0,
-			goodsNumber: 1, //购买数量
-			goodsid: '', //商品id
-			description: '', //商品描述
-			goodsObjact: {
-				percent: 1
-			}, //保存商品数据
-			//图片循环
-			imgList: [],
-			// 对比对象
-			actionPrice: 0, //默认选中商品价格
-			actionIntegral: 0, //默认选中商品积分
-			actionImage: '', //默认选中图片
-			good_list: '', //猜你喜欢列表
-			goodsNumberMax: 0, //最大可购买数量
-			// 倒计时数据保存
-			seckillObj: {
-				stopTime: 0, //结束时间
-				stop: false, //是否结束
-				stopTimeH: 0, //小时
-				stopTimeM: 0, //分钟
-				stopTimeS: 0, //秒钟
-				stopTimeD: 0, //天
-				upTime: 0 //更新组件内部组件用
-			},
-			// 拼团数据保存
-			pink: {
-				id: '', //拼团编号
-				uid: '', //用户编号
-				people: '', //拼团人数
-				price: '', //拼团价格
-				stop_time: '', //拼团结束时间
-				nickname: '', //团长昵称
-				avatar: '', //团长头像
-				count: '', //拼团剩余人数
-				h: '', //时
-				i: '', //分
-				s: '' //秒
-			},
-			userInfo: '',
-			isVip: '0'
-		};
-	},
-	filters: {
-		parseIntTo(percent) {
-			percent = +percent * 100;
-			if (percent % 1 === 0) {
-				return percent;
-			} else {
-				percent = percent.toFixed(1);
-				return percent;
-			}
-		}
-	},
-	async onLoad(options) {
-		let obj = this;
-		userinfo({}).then(({ data }) => {
-			obj.userInfo = data;
-			console.log(data, '123456');
-		});
-		//保存商品id
-		this.goodsid = options.id;
-		this.goodsType = options.type;
-		// 判断有无人邀请
-		if (options.spread) {
-			// 存储邀请人
-			uni.setStorageSync('spread', options.spread);
-		}
-		if (options.isVip) {
-			obj.isVip = options.isVip;
-		}
-		console.log(obj.isVip, 'vip');
-		saveUrl();
-		this.goodsDetail();
-		// 注册邀请信息
-		// #ifdef H5
-		let bool = uni.getStorageSync('weichatBrowser') || '';
-		if (bool) {
-			weixindata();
-		}
-		// #endif
-	},
-	computed: {
-		...mapState(['weichatObj', 'baseURL', 'urlFile'])
-	},
-	methods: {
-		//选择规格
-		selectSpec(item, arr, ind) {
-			arr.attr_value.forEach(function(e) {
-				e.check = false;
-			});
-			item.check = true;
-			let obj = this;
-			obj.specSelected[ind] = item.attr;
-			let str = obj.specSelected.join(',');
-			// 获取当前选中的对象
-			if (obj.productValue[str]) {
-				obj.buys_show = true;
-				obj.buys_shows = false;
-				obj.actionPrice = obj.productValue[str].price;
-				obj.actionIntegral = obj.productValue[str].integral; //保存默认选中商品积分
-				obj.goodsNumberMax = obj.productValue[str].stock;
-				obj.actionImage = obj.productValue[str].image;
-				obj.uniqueId = obj.productValue[str].unique;
-				obj.goodsStore = obj.productValue[str].stock;
-			} else {
-				(obj.buys_show = false), (obj.buys_shows = true);
-			}
-			if (obj.goodsStore == 0) {
-				obj.buys_show = false;
-				obj.buys_shows = true;
-			}
-			obj.specSelected[ind] = item.attr;
-		},
-		// 打開彈窗
-		specOPne(type = 1) {
-			let obj = this;
-			obj.specClass = 'show';
-			obj.type = type;
+	// import uniPopup from '@/components/uni-popup/uni-popup.vue'
+	import {
+		mapState
+	} from 'vuex';
+	import {
+		goodsDetail,
+		cartAdd
+	} from '@/api/product.js';
+	import {
+		confirm
+	} from '@/api/order.js'
+
+	export default {
+		data() {
+			return {
+				moneyAll: { //购物车金额详情
+					totalPrice: 0 //总金额	
+				},
+				orderKey: '', //订单的key值
+				addressData: {}, //地址信息
+				shopList: [], //商品列表
+				cartId: '', //购物车id
+				uniqueId: '',
+				type: 'yue', //支付状态
+				shopDetail: '', //商品详情
+				weixin: '',
+				yue: '',
+				shopId: '', //商品id
+				list: [
+					// 'https://img.php.cn/upload/article/202104/15/2021041518005466284.jpg',
+					// 'https://img.php.cn/upload/article/202104/15/2021041518005466284.jpg',
+					// 'https://img.php.cn/upload/article/202104/15/2021041518005466284.jpg'
+				]
+			};
 		},
-		//规格弹窗开关
-		toggleSpec(str) {
-			if (this.specClass === 'show') {
-				this.specClass = 'hide';
-				setTimeout(() => {
-					this.specClass = 'none';
-				}, 250);
-			} else if (this.specClass === 'none') {
-				this.specClass = 'show';
-			}
-			// 保存当前购买类型
-			this.type = str;
+		async onLoad(options) {
+			this.shopId = options.id
+			this.goodsDetail()
 		},
-		// 购买数量变化
-		numberChange(e) {
-			this.goodsNumber = e.number;
+		computed: {
+			...mapState(['weichatObj', 'baseURL', 'urlFile'])
 		},
-		// #ifdef H5
-		// 加载微信html5页面分享方法
-		shareDate() {
-			let obj = this;
-			// 保存分享人id链接
-			let url = window.location.href + '&spread=' + this.userInfo.uid;
-			// 判断是否微信浏览器
-			let bool = uni.getStorageSync('weichatBrowser') || '';
-			if (bool) {
-				// 过滤微信强制添加的链接地址
-				url = url.replace(/[\?,&]from=singlemessage/g, '');
+		methods: {
+			buy() {
+				let obj = this
 				let data = {
-					link: url, // 分享链接
-					imgUrl: obj.goodsObjact.image, // 分享图标
-					desc: obj.goodsObjact.store_info,
-					title: obj.goodsObjact.store_name,
-					success: function(e) {
-						console.log(e);
-					}
-				};
-				console.log(data, '分享');
-				shareLoad(data);
-			}
-		},
-		// #endif
-		// 跳转页面
-		navTo(url) {
-			uni.navigateTo({
-				url: '/pages/product/reply?id=' + this.goodsid
-			});
-		},
-		//加入购物车
-		Addcar(item) {
-			let obj = this;
-			cartAdd({
-				cartNum: '1', //商品数量
-				uniqueId: '', //商品标签
-				new: 0, //商品是否新增加到购物车1为不加入0为加入
-				mer_id: '',
-				productId: item.id //商品编号
-			})
-				.then(function(e) {
-					uni.showToast({
-						title: '成功加入购物车',
-						type: 'top',
-						duration: 500,
-						icon: 'none'
-					});
-
-					obj.goodsDetail();
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		goodsDetail() {
-			let obj = this;
-			// 获取普通商品信息
-			goodsDetail({}, this.goodsid).then(function({ data }) {
-				obj.list = data;
-				obj.good_list = data.good_list; //保存猜你喜欢列表
-				obj.reply = data.reply; //保存评论列表
-				let goods = data.storeInfo;
-				goods.integral = data.integral;
-				obj.goodsObjact = goods;
-				console.log(obj.goodsObjact, 'obj.goodsObjact');
-				if (obj.goodsObjact.description != null) {
-					obj.description = obj.goodsObjact.description.replace(/\<img/gi, '<img class="rich-img"');
-				} //小程序商品详情图超出屏幕问题
-				obj.imgList = goods.slider_image; //保存轮播图
-				obj.specList = data.productAttr; //保存分类列表
-				if (Array.isArray(data.productValue) != true) {
-					obj.many = 2;
-					obj.specList = data.productAttr; //保存产品属性
-					obj.productValue = data.productValue; //保存属性值
-					obj.specSelected = []; //初始化默认选择对象
-					for (let i = 0; i < obj.specList.length; i++) {
-						// 设置默认数据
-						let attrValue = obj.specList[i].attr_value[0];
-						attrValue.check = true;
-						obj.specSelected.push(attrValue.attr);
-					}
-					let str = obj.specSelected.join(',');
-					console.log(str, 'str');
-					// 设置默认值
-					obj.actionPrice = obj.productValue[str].price;
-					obj.actionIntegral = obj.productValue[str].integral; //保存默认选中商品积分
-					obj.goodsNumberMax = obj.productValue[str].stock;
-					obj.actionImage = obj.productValue[str].image;
-					obj.uniqueId = obj.productValue[str].unique;
-					obj.goodsStore = obj.productValue[str].quota;
-				} else {
-					obj.many = 1;
-					obj.productValue = data.productValue; //保存分类查询数据
-					obj.actionPrice = goods.price; //保存默认选中商品价格
-					obj.actionIntegral = goods.integral; //保存默认选中商品积分
-					obj.actionImage = goods.image_base; //保存默认选中商品图片
-					obj.goodsNumberMax = goods.stock; //保存默认选中最大可购买商品数量
+					cartNum: 1,
+					uniqueId: obj.uniqueId, //商品标签.默认无
+					new: '1',
+					// mer_id: '',//商店id暂未知晓
+					productId: obj.shopId
 				}
-				obj.shopId = data.mer_id; //保存商店id
-				// #ifdef H5
-				obj.shareDate();
-				// #endif
-			});
-		},
-		// #ifdef H5
-		// 加载微信html5页面分享方法
-		shareDate() {
-			let obj = this;
-			// 保存分享人id链接
-			let url = window.location.href + '&spread=' + this.userInfo.uid;
-			// 判断是否微信浏览器
-			let bool = uni.getStorageSync('weichatBrowser') || '';
-			if (bool) {
-				// 过滤微信强制添加的链接地址
-				url = url.replace(/[\?,&]from=singlemessage/g, '');
-				let data = {
-					link: url, // 分享链接
-					imgUrl: obj.goodsObjact.image, // 分享图标
-					desc: obj.goodsObjact.store_info,
-					title: obj.goodsObjact.store_name,
-					success: function(e) {
-						console.log(e);
-					}
-				};
-				shareLoad(data);
-			}
-		},
-		// #endif
-		// 立即购买
-		buy() {
-			let obj = this;
-			// 创建传值对象
-			let data = {
-				cartNum: obj.goodsNumber, //商品数量
-				new: 1,
-				productId: obj.goodsid, //商品编号
-				uniqueId: obj.uniqueId
-			};
-
-			if (obj.type == 2) {
-				data.new = 0;
-			}
-			cartAdd(data)
-				.then(function(e) {
-					let da = e.data;
-					if (obj.type == 1) {
-						// 跳转到支付页
-						uni.navigateTo({
-							url: '/pages/order/createOrder?id=' + da.cartId
-						});
-					}
-					if (obj.type == 2) {
-						uni.showToast({
-							title: '成功加入购物车',
-							type: 'top',
-							duration: 2000,
-							icon: 'none'
-						});
-						obj.goodsDetail();
-					}
-					obj.toggleSpec();
-				})
-				.catch(e => {
+				//生成订单
+				cartAdd(data).then(res => {
+					console.log(res, 'res');
+					//需要获取购物车号
+					obj.cartId = res.data.cartId
+					this.getKeys()
+				}).catch(e => {
 					console.log(e);
 				});
-		},
-		buy1() {
-			let obj = this;
-			let data = {
-				cartNum: obj.goodsNumber, //商品数量
-				new: 1,
-				productId: obj.goodsid, //商品编号
-				uniqueId: obj.uniqueId
-			};
 
-			if (obj.type == 2) {
-				data.new = 0;
-			}
-			cartAdd(data)
-				.then(function(e) {
-					let da = e.data;
-					if (obj.type == 1) {
-						// 跳转到支付页
-						uni.navigateTo({
-							url: '/pages/order/createOrder?id=' + da.cartId
-						});
-					}
-					if (obj.type == 2) {
-						uni.showToast({
-							title: '成功加入购物车',
-							type: 'top',
-							duration: 2000,
-							icon: 'none'
-						});
-						obj.goodsDetail();
-					}
-					obj.toggleSpec();
+				this.$refs.popupkf.open()
+				//点击购买之后自动生成订单
+				//如果订单生成没有付款,提示尚未付款,是否离开,确认离开,在我的订单里可看到尚未支付订单,点击付款,付款成功订单待发货,失败,尚未支付
+			},
+			getKeys() {
+				let obj = this
+				confirm({
+					cartId: obj.cartId
+				}).then(data => {
+					console.log(data, '生平具体信息');
+					obj.addressData = data.data.addressInfo || {};
+					obj.shopList = data.data.cartInfo; //商品列表
+					obj.moneyAll = data.data.priceGroup; //金额数据
+					obj.orderKey = data.data.orderKey; //订单key
+					let url = `/pages/money/pay?key=${obj.orderKey}`
+					console.log(url);
 				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 阻止触发上级事件
-		stopPrevent() {}
-	}
-};
-</script>
-
-<style lang="scss">
-/*  弹出层 */
-.popup {
-	position: fixed;
-	left: 0;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	z-index: 99;
-
-	&.show {
-		display: block;
-
-		.mask {
-			animation: showPopup 0.2s linear both;
-		}
+			},
+			//支付
+			pay() {
+				let obj = this
+				if (obj.type == 'weixin') {
 
-		.layer {
-			animation: showLayer 0.2s linear both;
-		}
-	}
+				}
+				if (obj.type == 'yue') {
 
-	&.hide {
-		.mask {
-			animation: hidePopup 0.2s linear both;
-		}
+				}
+			},
+			goodsDetail() {
+				let obj = this
+				goodsDetail({}, obj.shopId).then(res => {
+					obj.uniqueId = res.data.productValue['默认'].unique
+					obj.shopDetail = res.data.storeInfo
+					console.log(obj.shopDetail, obj.uniqueId, 'res1111');
 
-		.layer {
-			animation: hideLayer 0.2s linear both;
+				})
+			}
 		}
-	}
-
-	&.none {
-		display: none;
-	}
+	};
+</script>
 
-	.mask {
-		position: fixed;
-		top: 0;
-		width: 100%;
+<style lang="scss">
+	page,
+	.container {
 		height: 100%;
-		z-index: 1;
-		background-color: rgba(0, 0, 0, 0.4);
-	}
-
-	.layer {
-		position: fixed;
-		z-index: 99;
-		bottom: 0;
-		width: 100%;
-		min-height: 30vh;
-		border-radius: 10rpx 10rpx 0 0;
-		background-color: #fff;
-
-		.btn {
-			height: 66rpx;
-			line-height: 66rpx;
-			border-radius: 100rpx;
-			// background: $uni-color-primary;
-			background: #ff4c4c;
-			font-size: $font-base + 2rpx;
-			color: #fff;
-			margin: 30rpx auto 20rpx;
-		}
+		width: 750rpx;
+		margin: 0;
+		padding: 0;
+		background: #111111;
 	}
 
-	@keyframes showPopup {
-		0% {
-			opacity: 0;
-		}
-
-		100% {
-			opacity: 1;
-		}
+	.swiper-box {
+		background: #0C0A36;
 	}
 
-	@keyframes hidePopup {
-		0% {
-			opacity: 1;
-		}
+	.img {
+		margin: 50rpx auto;
+		width: 614rpx;
+		height: 660rpx;
 
-		100% {
-			opacity: 0;
-		}
-	}
-
-	@keyframes showLayer {
-		0% {
-			transform: translateY(120%);
-		}
-
-		100% {
-			transform: translateY(0%);
+		image {
+			width: 100%;
+			height: 100%;
 		}
 	}
 
-	@keyframes hideLayer {
-		0% {
-			transform: translateY(0);
-		}
-
-		100% {
-			transform: translateY(120%);
-		}
-	}
-}
+	.content-box {
+		border-bottom: 2rpx solid #919295;
+		padding: 30rpx;
+		display: flex;
+		flex-direction: column;
 
-/* 规格选择弹窗 */
-.attr-content {
-	padding: 10rpx 30rpx;
+		.content-top {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
 
-	.a-t {
-		display: flex;
+			.hd {
+				font-size: 38rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FFFFFF;
+				line-height: 42rpx;
+			}
 
-		image {
-			width: 170rpx;
-			height: 170rpx;
-			flex-shrink: 0;
-			border-radius: 8rpx;
+			.content-img {
+				display: flex;
+				align-items: center;
+				justify-content: space-around;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #585BE7;
+				line-height: 39rpx;
+				padding: 10rpx;
+				height: 41rpx;
+				border: 2rpx solid #585BE7;
+				border-radius: 5rpx;
+
+				image {
+					width: 26rpx;
+					height: 26rpx;
+				}
+			}
 		}
 
-		.right {
+		.content-center {
+			margin: 20rpx 0;
 			display: flex;
 			flex-direction: column;
-			padding-left: 24rpx;
-			font-size: $font-sm + 2rpx;
-			color: $font-color-base;
-			line-height: 42rpx;
 
-			.good-name {
-				padding-top: 20rpx;
-				max-width: 320rpx;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #1d2023;
+			.title {
+				font-size: 24rpx;
+				font-weight: 500;
+				color: #FFFFFF;
 				line-height: 42rpx;
-				margin-bottom: 15rpx;
 			}
+		}
+
+		.content-bottom {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
 
 			.price {
-				font-size: 40rpx;
-				font-family: PingFang SC;
+				display: flex;
+				justify-content: flex-end;
+				font-size: 48rpx;
 				font-weight: bold;
-				color: #ff6f0f;
-				// font-size: $font-lg;
-				// color: $uni-color-primary;
-				// margin-bottom: 10rpx;
+				color: #585BE7;
+
+				span {
+					font-size: 24rpx;
+					font-weight: bold;
+					color: #666666;
+					font-family: SourceHanSerifSC;
+					line-height: 66rpx;
+				}
 			}
 
-			.selected-text {
-				margin-right: 10rpx;
+			.gobuy {
+				width: 334rpx;
+				height: 90rpx;
+				background: linear-gradient(270deg, #6E8DF7, #9977F6);
+				border-radius: 10rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 90rpx;
+				text-align: center;
 			}
 		}
 	}
 
-	.attr-list {
+	.rz {
+
 		display: flex;
 		flex-direction: column;
-		font-size: $font-base + 2rpx;
-		color: $font-color-base;
-		padding-top: 30rpx;
-		padding-left: 10rpx;
-	}
+		align-items: center;
 
-	.item-list {
-		padding: 20rpx 0 0;
-		display: flex;
-		flex-wrap: wrap;
+		.rz-title {
+			margin: 35rpx 0;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FFFFFF;
+			line-height: 42rpx;
+		}
 
-		.tit {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			background: #eee;
-			// margin-left: 10rpx;
-			margin-right: 20rpx;
-			margin-bottom: 20rpx;
-			border-radius: 100rpx;
-			min-width: 60rpx;
-			height: 60rpx;
+		.rz-ms {
 			padding: 0 20rpx;
-			font-size: $font-base;
-			color: $font-color-dark;
-		}
+			width: 690rpx;
+			font-size: 24rpx;
+			line-height: 36rpx;
+			color: #FFFFFF;
+			word-wrap: break-word;
+			word-break: normal;
 
-		.selected {
-			background: #fceff1;
-			border: 1px solid #ef041f;
-			color: #ef041f;
 		}
-	}
-}
-
-//默认商品底部高度
-.goodsBottom {
-	height: 160rpx;
-}
-
-page {
-	background: #f0f0f0;
-}
-
-//秒杀、拼团底部高度
-.contentBottomHeight {
-	height: 110rpx;
-}
-
-//默认商品底部高度
-.goodsBottom {
-	height: 160rpx;
-}
-
-/deep/ .iconenter {
-	font-size: $font-base + 2rpx;
-	color: #888;
-}
-
-/deep/ .con_image {
-	width: 130rpx;
-	height: 130rpx;
-	display: inline-block;
-	padding: 15rpx;
-
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
 
-/* 商品详情中限制图片大小 */
-/deep/ .rich-img {
-	width: 100% !important;
-	height: auto;
-}
+		.rz-content {
+			padding: 20rpx;
+			display: flex;
+			flex-direction: column;
+			width: 690rpx;
+			background: #222222;
+			border-radius: 20rpx;
 
-.c-list {
-	margin-top: 20rpx;
-	font-size: $font-sm + 2rpx;
-	color: $font-color-base;
-	background: #fff;
+			.con-box {
+				line-height: 60rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
 
-	.c-row {
-		display: flex;
-		align-items: center;
-		padding: 20rpx 30rpx;
-		position: relative;
-	}
+				.left {
+					font-size: 24rpx;
+					color: #A5A5A5;
+
+				}
+
+				.right {
+					display: flex;
+					align-items: center;
 
-	.tit {
-		width: 140rpx;
-	}
 
-	.con {
-		flex: 1;
-		color: $font-color-dark;
+					.address {
+						color: #6363FE;
+						font-size: 24rpx;
+						width: 300rpx;
+						text-align: right;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+					.copy {
+						margin-left: 15rpx;
+						margin-bottom: 22rpx;
+						width: 30rpx;
+						height: 30rpx;
 
-		.selected-text {
-			margin-right: 10rpx;
+						image {
+							width: 30rpx;
+							height: 30rpx;
+						}
+					}
+				}
+			}
 		}
 	}
 
-	.bz-list {
-		height: 40rpx;
-		font-size: $font-sm + 2rpx;
-		color: $font-color-dark;
+	.popup-box {
+
+		width: 750rpx;
+		height: 404rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx 10rpx 0px 0px;
 
-		text {
-			display: inline-block;
-			margin-right: 30rpx;
+		.pop-title {
+			line-height: 70rpx;
+			margin: 25rpx;
+			font-size: 28rpx;
+			font-weight: bold;
+			color: #333333;
 		}
-	}
 
-	.con-list {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		color: $font-color-dark;
-		line-height: 40rpx;
-	}
+		.pop-radio {
+			display: flex;
+
+			.pop-radio-box {
+				height: 100rpx;
+				display: flex;
+				align-items: center;
+				padding: 25rpx;
+				justify-content: space-between;
+				width: 750rpx;
+
+				.pop-radio-cont {
+					display: flex;
+
+					img {
+						width: 40rpx;
+						height: 40rpx;
+
+					}
+
+					text {
+						margin-left: 10rpx;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #3F454B;
+					}
+				}
+			}
+
+			.pop-bottom {
+				position: fixed;
+				bottom: 0;
+				right: 0;
+				height: 93rpx;
+				width: 750rpx;
+				display: flex;
+				justify-content: space-between;
+
+				.pirce {
+					display: flex;
+					align-items: center;
+					margin-left: 25rpx;
+
+					.price-left {
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #3F454B;
+						line-height: 100px;
+					}
 
-	.red {
-		color: $uni-color-primary;
+					display: flex;
+
+					.price-right {
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #FD3B39;
+						line-height: 55px;
+
+						span {
+							font-size: 36rpx;
+							font-weight: 500;
+							color: #FD3B39;
+							line-height: 55px;
+						}
+					}
+				}
+
+				.buy {
+					width: 360rpx;
+					height: 93rpx;
+					background: linear-gradient(270deg, #6E8DF7, #9977F6);
+					font-size: 32rpx;
+					font-weight: bold;
+					line-height: 93rpx;
+					text-align: center;
+					color: #FFFFFF;
+				}
+			}
+		}
 	}
-}
 </style>

pages/public/login.vue

@@ -1,441 +1,238 @@
 <template>
-	<view class="container">
-		<view class="top"><image src="../../static/img/login-bg.png" mode=""></image></view>
-		<view class="logo">
-			<view class="logo-img"><image src="../../static/img/logo.png" mode=""></image></view>
-			<view class="logo-title">微乐种</view>
+	<view class="content">
+		<view class="title-img">
+			<image src="../../static/error/missing-face.png" mode=""></image>
 		</view>
-		<view class="login-box">
-			<view class="username"><image src="../../static/img/phone.png" mode=""></image></view>
-			<view class="input-bbox">
-				<input class="input-user" type="text" v-model="phone" placeholder="请输入账号" />
-				<!-- <text class="select-box">
-					<select class="select" @change="change($event)" ref='hhh'>
-						<option value="1" @click="change">1</option>
-						<option value="2">2</option>
-					</select>
-				</text> -->
-			</view>
+		<view class="title-LOGO">
+			LOGO
 		</view>
-		<view class="login-box">
-			<view class="username" style="width: 30rpx; height: 36rpx;"><image src="../../static/img/zfpwd.png" mode=""></image></view>
-			<input class="input-box" type="password" v-model="password" placeholder="请输入密码" />
+		<view class="bg">
+			<image src="../../static/public/pbbg.png" mode=""></image>
 		</view>
 
-		<view class="login" @click="toLogin">登录</view>
-		<view class="forget flex">
-			<view @click="navTo('/pages/public/forget')">忘记密码</view>
-			<view class="shu"></view>
-			<view class="login-tip"><text class="register" @click="navTo('/pages/public/register')">立即注册</text></view>
+		<view class="register-content">
+			<view class="res-box">
+				<image src="../../static/public/pb03.png" mode=""></image>
+				<input class="input" type="number" v-model="phone" placeholder="请输入手机号">
+			</view>
+			<view class="res-box">
+				<image src="../../static/public/pb02.png" mode=""></image>
+				<input class="input" type="password" v-model="loginPass" placeholder="请输入密码">
+			</view>
+			<!-- <view class="res-box">
+				<image src="../../static/public/pb01.png" mode=""></image>
+				<input class="input" type="number" v-model="code" placeholder="请输入验证码">
+			</view> -->
 		</view>
-		<label class="two" @click="checkboxChange">
-			<radio style="transform:scale(0.7)" color="#5dbc7c" :checked="istype" />
-			我已阅读并同意
-			<text @click.stop="navTo('/pages/contract/agreement')">《用户协议》</text>
-			&nbsp
-			<text @click.stop="navTo('/pages/contract/privacy')">《隐私政策》</text>
-		</label>
-		<!-- <view class="flex other">
-			<view class="fenge"></view>
-			<view class="qita">其他方式登录</view>
-			<view class="fenge"></view>
-		</view> -->
-		<!-- #ifndef APP-PLUS -->
-		<!-- <view class="weixin" @click="wecahtLogin('weixin')"><image src="/static/img/login-weixin.png"></image></view>
-		<view class="weixin_text" @click="wecahtLogin('weixin')">微信登录</view> -->
-		<!-- #endif -->
-		<!-- #ifdef APP-PLUS -->
-		<!-- <block v-if="!is_ios">
-			<view class="weixin" @click="wecahtLogin('weixin')"><image src="/static/img/login-weixin.png" mode="scaleToFill"></image></view>
-			<view class="weixin_text" @click="wecahtLogin('weixin')">微信登录</view>
-		</block>
-		<block v-else>
-			<view class="ios_login flex" @click="wecahtLogin('weixin')">
-				<text class="iconfont iconweixin"></text>
-				<text class="weixin_text">微信登录</text>
+		<view class="button" @click="registerTo">
+			登录
+		</view>
+		<view class="tishi">
+			<view class="for-pass" @click="getNavto('/pages/set/changePass')">
+				忘记密码
 			</view>
-			<view v-if="is_apple_login" class="ios_login flex" @click="wecahtLogin('apple')">
-				<image class="loginIcon" src="/static/static/icon/appleIcon.png" mode=" scaleToFill"></image>
-				<text class="weixin_text">通过Apple登录</text>
+			<view class="ss">
+
 			</view>
-		</block> -->
-		<!-- #endif -->
+			<view class="for-phone" @click="getNavto('/pages/public/register')">
+				账号注册
+			</view>
+		</view>
 	</view>
 </template>
-
 <script>
-import { mapMutations } from 'vuex';
-import { login, loginWx } from '@/api/login.js';
-import { getUserInfo } from '@/api/user.js';
-import { getFileIndex, getFile, writerTxt, getFileText } from '@/utils/fileController.js';
-// #ifdef H5
-import { loginWinxin } from '@/utils/wxAuthorized';
-// #endif
-export default {
-	data() {
-		return {
-			phone: '',
-			password: '',
-			istype: false,
-			// #ifdef APP-PLUS
-			is_ios: false, //判断是否为ios手机
-			is_apple_login: false //是否有ios授权登录功能
-			// #endif
-		};
-	},
-	onLoad() {
-		uni.hideLoading();
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'login']),
-		checkboxChange() {
-			this.istype = !this.istype;
-			console.log(this.istype);
+	import {
+		mapMutations
+	} from 'vuex';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	import {
+		register,
+		verify,
+		login
+	} from '@/api/login.js';
+	export default {
+		data() {
+			return {
+				phone: '', //用户
+				loginPass: '', //密码
+				payPass: '',
+				invitation: '', //邀请码
+				code: '', //验证码
+				time: '', //保存倒计时对象
+				countDown: 0 //倒计时
+			};
 		},
-		change(e) {
-			this.phone = e.target.value;
+		onLoad() {
+			// 获取扫码邀请人id
+			this.invitation = uni.getStorageSync('spread') || '';
 		},
-		//登录
-		wecahtLogin(type) {
-			let obj = this;
-			// #ifdef H5
-			let weichatBrowser = uni.getStorageSync('weichatBrowser');
-			if (weichatBrowser) {
-				loginWinxin();
-			}
-			// #endif
-			// #ifdef APP-PLUS
-			uni.login({
-				provider: type,
-				success(e) {
-					console.log(e, 'e12345678989789');
-					uni.getUserInfo({
-						provider: type,
-						success(es) {
-							console.log(es, 'es123456789');
-							if (type === 'weixin') {
-								console.log('weixin');
-								loginWx(es.userInfo)
-									.then(e => {
-										uni.showLoading({
-											title: '登录中'
-										});
-										console.log(e, '123456');
-										uni.setStorageSync('token', e.data.token);
-										getUserInfo({}).then(e => {
-											obj.login();
-											// 保存返回用户数据
-											obj.setUserInfo(e.data);
-											uni.hideLoading();
-											//成功跳转首页
-											uni.switchTab({
-												url: '/pages/index/index'
-											});
-										});
-									})
-									.catch(e => {
-										console.log(e);
-										uni.showModal({
-											content: JSON.stringify(e),
-											success() {},
-											fail() {}
-										});
-									});
-							}
-							if (type === 'apple') {
-								console.log(es.userInfo);
-								applelogin({
-									account: es.userInfo.openId
-								})
-									.then(function(e) {
-										console.log(e, 'token');
-										uni.setStorageSync('token', e.data.token);
-										getUserInfo({}).then(e => {
-											obj.login();
-											// 保存返回用户数据
-											obj.setUserInfo(e.data);
-											//成功跳转首页
-											uni.switchTab({
-												url: '/pages/index/index'
+		// computed: {
+		// 	...mapMutations('user', ['setUserInfo', 'login']),
+		// },
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'login']),
+			//跳转详情
+			getNavto(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			//登录
+			registerTo() {
+				let obj = this
+				let jiaoyan = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
+				if (!jiaoyan.test(obj.phone)) {
+					this.$api.msg('请输入正确的手机号!')
+					return
+				} else if (obj.phone == '') {
+					this.$api.msg('请输入手机号')
+					return
+				} else if (obj.loginPass == '') {
+					this.$api.msg('请输入密码')
+					return
+				} else {
+					login({
+						account: obj.phone,
+						password: obj.loginPass
+
+					}).then(res => {
+						console.log(res, 'res');
+						//传入账号密码之后,登录接口会返回给我一个登陆时间以及token,我把存到本地缓存里
+						//然后获取用户信息接口,缓存接口给我的data,然后跳转至首页即可
+						uni.setStorageSync('token', res.data.token)
+						getUserInfo({}).then(res => {
+							
+							// console.log(res, 'res');
+							obj.login(); //确认登录状态
+							console.log(obj.login);
+							console.log('18252757278','w');
+							//用户数据获取到的用户信息存储到本地里
+							obj.setUserInfo(res.data);
+							let ur = uni.getStorageSync('present') || '/pages/index/index';
+							uni.switchTab({
+								url: '/pages/index/index',
+								fail(e) {
+									uni.navigateTo({
+										url: ur,
+										fail(e) {
+											uni.navigateTo({
+												url: '/pages/index/index',
 											});
-										});
-									})
-									.catch(function(e) {
-										console.log(e);
+										}
 									});
-							}
-						},
-						fail(es) {
-							uni.showModal({
-								content: JSON.stringify(es),
-								success() {
-									// obj.login();
-									// // 保存返回用户数据
-									// obj.setUserInfo(e.data);
-									// //成功跳转首页
-									// uni.switchTab({
-									// 	url: '/pages/index/index'
-									// });
 								}
-							});
-						}
-					});
-				},
-				fail(e) {
-					uni.showModal({
-						title: '提示',
-						content: JSON.stringify(e),
-						showCancel: false
+							})
+						})
+
+					}).catch(function(e) {
+						console.log(e);
 					});
 				}
-			});
-			// #endif
-		},
-		async toLogin() {
-			uni.showLoading({
-				title: '正在登陆中'
-			});
-			let obj = this;
-			obj.logining = true;
-			if (obj.phone == '') {
-				obj.$api.msg('请输入账号');
-				return;
-			}
-			if (obj.password == '') {
-				obj.$api.msg('请输入密码');
-				return;
-			}
-			if (!obj.istype) {
-				obj.$api.msg('请查看并同意用户协议和隐私政策');
-				return;
-			}
-			login({
-				account: obj.phone,
-				password: obj.password
-			})
-				.then(function(e) {
-					uni.setStorageSync('token', e.data.token);
-					getUserInfo({}).then(e => {
-						obj.login();
-						//#ifdef APP-PLUS
-						getFileIndex().then(info => {
-							getFile(info, 'userInfo').then(data => {
-								writerTxt(data, e.data);
-							});
-						});
-						//#endif
-						// 保存返回用户数据
-						obj.setUserInfo(e.data);
+			},
+
 
-						uni.switchTab({
-							url: '/pages/index/index'
-						});
-					});
-					uni.hideLoading();
-				})
-				.catch(function(e) {
-					console.log(e);
-				});
-		},
-		navTo(url) {
-			uni.navigateTo({
-				url
-			});
-		},
-		// 后退
-		navBack() {
-			uni.navigateBack();
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	min-height: 100%;
-	background-color: #ffffff;
-}
-.top {
-	width: 750rpx;
-	height: 470rpx;
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-.logo {
-	position: absolute;
-	left: 50%;
-	right: 0;
-	top: 110rpx;
-	margin-left: -80rpx;
-	.logo-img {
-		width: 160rpx;
-		height: 160rpx;
-		box-shadow: 0px 12rpx 13rpx 0px rgba(51, 145, 255, 0.47);
-		border-radius: 50%;
-		image {
-			width: 100%;
-			height: 100%;
+	page,
+	.content {
+		min-height: 100%;
+		background-color: #181818;
+
+		.bg {
+			width: 750rpx;
+			height: 200rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.title-img {
+			margin: 70rpx auto 0;
+			width: 161px;
+			height: 161px;
 			border-radius: 50%;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
 		}
-	}
-	.logo-title {
-		width: 160rpx;
-		text-align: center;
-		font-size: 32rpx;
-		font-family: PingFang SC;
-		font-weight: 400;
-		color: #ffffff;
-		margin-top: 10rpx;
-	}
-}
-.loginTitle {
-	font-weight: bold;
-	color: #333333;
-	font-size: 58rpx;
-	padding-bottom: 34rpx;
-}
-.loginText {
-	font-weight: 500;
-	color: #333333;
-	font-size: 34rpx;
-	padding-bottom: 34rpx;
-}
-.login-box {
-	display: flex;
-	justify-content: flex-start;
-	border-bottom: 1px solid #eeeeee;
-	margin: 90rpx 72rpx 0;
-	padding-bottom: 28rpx;
-	.username {
-		width: 26rpx;
-		height: 43rpx;
-		font-weight: 500;
-		color: #333333;
-		font-size: 32rpx;
-		flex-shrink: 0;
-		image {
-			width: 100%;
-			height: 100%;
+
+		.title-LOGO {
+			text-align: center;
+			margin: 30rpx;
+			font-size: 36px;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #FFFFFF;
 		}
-	}
-	.input-box {
-		margin-left: 40rpx;
-		width: 100%;
-	}
-	.input-bbox {
-		margin-left: 40rpx;
-		width: 100%;
-		position: relative;
-		.input-user {
-			background: #ffffff;
-			position: absolute;
-			z-index: 10;
-			top: 0;
-			left: 0;
-			width: 90%;
+
+		.register-content {
+			.res-box {
+				height: 110rpx;
+				align-items: center;
+				display: flex;
+				margin: 0 75rpx;
+				border-bottom: #f3f3f3 solid 2rpx;
+
+				image {
+					width: 31rpx;
+					height: 40rpx;
+				}
+
+				.input {
+					color: #9977F6;
+					margin-left: 40rpx;
+				}
+			}
 		}
-		.select-box {
-			background: #ffffff;
-			position: absolute;
-			top: 0;
-			left: 0;
-			bottom: 0;
-			width: 100%;
-			.select {
-				background: #ffffff;
-				outline: none;
-				height: 100%;
-				border: none;
-				width: 100%;
+
+		.button {
+			margin: 40rpx auto;
+			text-align: center;
+			width: 452rpx;
+			height: 90rpx;
+			background: linear-gradient(270deg, #6E8DF7, #9977F6);
+			border-radius: 45rpx;
+			font-size: 34rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 90rpx;
+		}
+
+		.tishi {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+
+			.for-pass {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.ss {
+				height: 26rpx;
+				width: 3rpx;
+				background-color: #f3f3f3;
+				margin: 0 10rpx;
+			}
+
+			.for-phone {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #FFFFFF;
 			}
+
 		}
 	}
-}
-.forget {
-	justify-content: center;
-	text-align: right;
-	margin: 36rpx 0rpx;
-	font-weight: 500;
-	color: #1dcbe4;
-	font-size: 28rpx;
-	.mui-checkbox {
-		font-weight: 500;
-		color: #333333;
-		font-size: 35rpx;
-	}
-	.shu {
-		height: 26rpx;
-		width: 1px;
-		background-color: #1dcbe4;
-		margin: 0 10rpx;
-	}
-}
-.login {
-	margin: 100rpx auto 0;
-	width: 604rpx;
-	height: 90rpx;
-	background: #08d29b;
-	box-shadow: 0px 12rpx 13rpx 0px rgba(51, 145, 255, 0.2);
-	border-radius: 10rpx;
-	font-size: 34rpx;
-	font-family: SourceHanSansCN;
-	font-weight: 400;
-	color: #ffffff;
-	line-height: 90rpx;
-	text-align: center;
-}
-.login-tip {
-	text-align: center;
-	font-weight: 500;
-	color: #333333;
-	font-size: 28rpx;
-	.register {
-		color: #08d29b;
-	}
-}
-.other {
-	margin-top: 60rpx;
-	.fenge {
-		width: 30%;
-		height: 2rpx;
-		background-color: #eeeeee;
-	}
-	.qita {
-		font-size: 28rpx;
-		color: #999999;
-	}
-}
-.weixin {
-	width: 75rpx;
-	height: 75rpx;
-	margin: 25rpx auto;
-}
-.weixin image {
-	width: 100%;
-	height: 100%;
-}
-.weixin_text {
-	text-align: center;
-	font-size: 28rpx;
-	color: #999999;
-}
-.forget {
-	font-size: 28rpx;
-	width: 100%;
-	text-align: right;
-	color: #999999;
-}
-.two {
-	margin: 20rpx 40rpx;
-	font-size: 28rpx;
-	text-align: center;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #999999;
-	text {
-		color: #5dbc7c;
-	}
-}
 </style>

pages/public/register.vue

@@ -1,228 +1,293 @@
 <template>
-	<view class="container">
-		<view class="status_bar"><!-- 这里是状态栏 --></view>
-		<view class="loginTitle">欢迎注册微乐种商城</view>
-		<view class="loginText">请认真填写个人信息</view>
-		<view class="login-box">
-			<view class="username">账号</view>
-			<input class="input-box" type="text" v-model="phone" placeholder="请输入邮箱/电话" />
+	<view class="content">
+		<view class="title-img">
+			<image src="../../static/error/missing-face.png" mode=""></image>
 		</view>
-		<view class="login-box">
-			<view class="username">验证码</view>
-			<view class="flex">
-				<input class="input-box" type="number" v-model="code" placeholder="请输入验证码" />
-				<view class="code" @click="verification">{{ countDown == 0 ? '获取验证码' : countDown }}</view>
+		<view class="title-LOGO">
+			LOGO
+		</view>
+		<view class="bg">
+			<image src="../../static/public/pbbg.png" mode=""></image>
+		</view>
+
+		<view class="register-content">
+			<view class="res-box">
+				<image src="../../static/public/pb03.png" mode=""></image>
+				<view class="input-box">
+					<input class="input" type="number" v-model="phone" placeholder="请输入手机号">
+				</view>
+			</view>
+			<view class="res-box">
+				<image src="../../static/public/pb02.png" mode=""></image>
+				<view class="input-box">
+					<input class="input" type="password" v-model="loginPass" placeholder="请输入密码">
+				</view>
+			</view>
+			<view class="res-box">
+				<image src="../../static/public/pb01.png" mode=""></image>
+				<view class="input-box">
+					<input class="input" type="number" v-model="code" placeholder="请输入验证码">
+					<view class="time" @click="getYzm" v-show="isHq">
+						获取验证码
+					</view>
+					<view class="djs" v-show="!isHq">
+						{{countDown}}
+					</view>
+				</view>
 			</view>
 		</view>
-		<view class="login-box">
-			<view class="username">登录密码</view>
-			<input class="input-box" type="password" v-model="loginPass" placeholder="请输入登录密码" />
+		<view class="button" @click="registerTo()">
+			注册
 		</view>
-		<!-- <view class="login-box">
-			<view class="username">交易密码</view>
-			<input class="input-box" type="password" v-model="payPass" placeholder="请输入6位数的交易密码" />
-		</view> -->
-		<view class="login-box">
-			<view class="username">邀请码(选填)</view>
-			<input class="input-box" type="text" v-model="invitation" placeholder="请输入邀请码" />
+		<view class="tishi">
+			<view class="for-pass" @click="getNavto('/pages/set/changePass')">
+				忘记密码
+			</view>
+			<view class="ss">
+
+			</view>
+			<view class="for-phone" @click="getNavto('/pages/public/login')" >
+				账号登录
+			</view>
 		</view>
-		<label class="two" @click="checkboxChange">
-			<radio style="transform:scale(0.7)" color="#5dbc7c" :checked="istype" />
-			我已阅读并同意
-			<text @click.stop="navTo('/pages/contract/agreement')">《用户协议》</text>
-			&nbsp
-			<text @click.stop="navTo('/pages/contract/privacy')">《隐私政策》</text>
-		</label>
-		<view class="login" @click="register">注册</view>
 	</view>
 </template>
-
 <script>
-import { register, verify } from '@/api/login.js';
-export default {
-	data() {
-		return {
-			phone: '', //用户
-			loginPass: '', //密码
-			payPass: '',
-			invitation: '', //邀请码
-			code: '', //验证码
-			time: '', //保存倒计时对象
-			countDown: 0 //倒计时
-		};
-	},
-	onLoad() {
-		// 获取扫码邀请人id
-		this.invitation = uni.getStorageSync('spread') || '';
-	},
-	watch: {
-		// 监听倒计时
-		countDown(i) {
-			if (i == 0) {
-				clearInterval(this.time);
-			}
-		}
-	},
-	methods: {
-		checkboxChange() {
-			this.istype = !this.istype;
-			console.log(this.istype);
+	import {
+		register,
+		verify
+	} from '@/api/login.js';
+	export default {
+		data() {
+			return {
+				isHq: true,
+				phone: '', //用户
+				loginPass: '', //密码
+				payPass: '',
+				invitation: '', //邀请码
+				code: '', //验证码
+				time: '', //保存倒计时对象
+				countDown: 10 //倒计时
+			};
 		},
-		// 注册
-		register() {
-			let obj = this;
-			if (obj.phone == '') {
-				obj.$api.msg('请输入账号');
-				return;
-			}
-			if (!/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(obj.phone) && !/(^1[3|4|5|6|7|8|9][0-9]{9}$)/.test(this.phone)) {
-				obj.$api.msg('请输入正确的邮箱或手机');
-				return;
-			}
-			if (obj.loginPass == '') {
-				obj.$api.msg('请输入登录密码');
-				return;
-			}
-			if (obj.code == '') {
-				obj.$api.msg('请输入验证码');
-				return;
-			}
-			// if (obj.invitation == '') {
-			// 	obj.$api.msg('请输入邀请码');
-			// 	return;
-			// }
-			if (!obj.istype) {
-				obj.$api.msg('请查看并同意用户协议和隐私政策');
-				return;
-			}
-			register({
-				account: obj.phone, //账号
-				captcha: obj.code, //验证码
-				password: obj.loginPass,
-				trade_password: obj.payPass,
-				spread: obj.invitation
-			}).then(function(e) {
-				uni.showToast({
-					title: '注册成功',
-					duration: 2000,
-					position: 'top',
-					icon: 'none'
-				});
-				setTimeout(function() {
-					uni.navigateTo({
-						url: '/pages/public/login'
-					});
-				}, 1000);
-			});
-			//调用注册接口，成功跳转登录页
+		onLoad() {
+			// 获取扫码邀请人id
+			this.invitation = uni.getStorageSync('spread') || '';
 		},
-		//发送验证码
-		verification() {
-			let obj = this;
-			if (this.phone == '') {
-				this.$api.msg('请输入账号');
-				return;
-			}
-			if (!/^([a-zA-Z]|[0-9])(\w|\-|\.)+@[a-zA-Z0-9]+(\.([a-zA-Z]{2,4}))+$/.test(obj.phone) && !/(^1[3|4|5|6|7|8|9][0-9]{9}$)/.test(this.phone)) {
-				obj.$api.msg('请输入正确的账号');
-				return;
-			}
-			// 判断是否在倒计时
-			if (obj.countDown > 0) {
-				return false;
-			} else {
-				obj.countDown = 60;
-				obj.time = setInterval(() => {
-					obj.countDown--;
-				}, 1000);
-				//调用验证码接口
-				verify({
-					phone: obj.phone,
-					type: 'register'
+		methods: {
+			//注册
+			registerTo(){
+				let obj= this
+				let jiaoyan = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
+				if (!jiaoyan.test(obj.phone)) {
+					this.$api.msg('请输入正确的手机号!')
+					return
+				}else if(obj.phone == ''){
+					this.$api.msg('请输入手机号')
+					return
+				}else if(obj.loginPass==''){
+					this.$api.msg('请输入密码')
+					return
+				}else if(obj.code == ''){
+					this.$api.msg('请输入验证码')
+					return
+				}else if(obj.code.length!=6){
+					this.$api.msg('请输入正确的验证码')
+					return
+				}
+				else{
+					register({
+						account:obj.phone,
+						captcha:obj.code,
+						password:obj.loginPass,
+						spread:obj.invitation
+						
+					}).then(res=>{
+						console.log(res,'res');
+						this.$api.msg('注册成功')
+						setTimeout(function(){
+							uni.navigateTo({
+								url:'/pages/public/login'
+							})
+						},1000)
+					})
+				}
+			},
+			//跳转详情
+			getNavto(url){
+				uni.navigateTo({
+					url:url
 				})
-					.then(({ data }) => {
-						uni.showToast({
-							title: '验证码已发送',
-							duration: 2000,
-							position: 'top',
-							icon: 'none'
-						});
+			},
+			//获取验证码
+			getYzm() {
+				let obj = this
+				let jiaoyan = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
+				if (!jiaoyan.test(obj.phone)) {
+					this.$api.msg('请输入正确的手机号!')
+					return
+				}
+
+				let setTime = setInterval(
+					function() {
+						obj.isHq = false
+						obj.countDown--;
+						
+						if (obj.countDown == 0) {
+							clearInterval(setTime)
+							// let setOut = setTimeout(() => {
+								obj.isHq = true
+								obj.countDown=10;
+							// }, 1000)
+						}
+
+					}, 1000)
+					//调用验证码接口
+					verify({
+						phone: obj.phone,
+						type: 'register'
 					})
-					.catch(err => {
-						console.log(err);
-					});
+						.then(({ data }) => {
+							console.log(data,'data');
+						})
+						.catch(err => {
+							console.log(err);
+						});
+					
 			}
+
+
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	min-height: 100%;
-	background-color: #ffffff;
+	page,
+	.content {
+		min-height: 100%;
+		background-color: #181818;
 
-	.container {
-		width: 100%;
-		padding: 10% 60rpx 0rpx 60rpx;
-	}
-}
-
-.status_bar {
-	height: var(--status-bar-height);
-	width: 100%;
-}
-
-.loginTitle {
-	font-weight: bold;
-	color: #333333;
-	font-size: 58rpx;
-	padding-bottom: 25rpx;
-}
-
-.loginText {
-	font-weight: 500;
-	color: #333333;
-	font-size: 34rpx;
-}
-
-.login-box {
-	padding-top: 70rpx;
-
-	.username {
-		padding-bottom: 25rpx;
-		font-weight: 500;
-		color: #333333;
-		font-size: 32rpx;
+		.bg {
+			width: 750rpx;
+			height: 200rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.title-img {
+			margin: 70rpx auto 0;
+			width: 161px;
+			height: 161px;
+			border-radius: 50%;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.title-LOGO {
+			text-align: center;
+			margin: 30rpx;
+			font-size: 36px;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #FFFFFF;
+		}
+
+		.register-content {
+			.res-box {
+				height: 110rpx;
+				width: 600rpx;
+				align-items: center;
+				display: flex;
+				margin: 0 75rpx;
+				border-bottom: #f3f3f3 solid 2rpx;
+
+				image {
+					width: 31rpx;
+					height: 40rpx;
+				}
+
+				.input-box {
+					margin-left: 40rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.input {
+						color: #9977F6;
+						// line-height: 40rpx;
+
+					}
+
+					.time {
+						width: 150rpx;
+						height: 50rpx;
+						line-height: 50rpx;
+						text-align: center;
+						border-radius: 10rpx;
+						color: #FFFFFF;
+						background: linear-gradient(270deg, #6E8DF7, #9977F6);
+					}
+
+					.djs {
+						margin-left: 100rpx;
+						width: 50rpx;
+						height: 50rpx;
+						line-height: 50rpx;
+						text-align: center;
+						border-radius: 10rpx;
+						color: #FFFFFF;
+						background: linear-gradient(270deg, #6E8DF7, #9977F6);
+					}
+				}
+
+			}
+		}
+
+		.button {
+			margin: 40rpx auto;
+			text-align: center;
+			width: 604rpx;
+			height: 90rpx;
+			background: linear-gradient(270deg, #6E8DF7, #9977F6);
+			border-radius: 10rpx;
+			font-size: 34rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 90rpx;
+		}
+
+		.tishi {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+
+			.for-pass {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.ss {
+				height: 26rpx;
+				width: 3rpx;
+				background-color: #f3f3f3;
+				margin: 0 10rpx;
+			}
+
+			.for-phone {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+		}
 	}
-}
-
-.login {
-	background: #5dbc7c;
-	margin-top: 20rpx;
-	color: #ffffff;
-	text-align: center;
-	padding: 26rpx 0rpx;
-	border-radius: 50rpx;
-	margin-top: 60rpx;
-}
-
-.code {
-	background: #5dbc7c;
-	color: #ffffff;
-	border-radius: 10rpx;
-	font-weight: 500;
-	color: #ffffff;
-	font-size: 26rpx;
-	padding: 12rpx 19rpx;
-}
-
-// /* input 样式 */
-// .input-placeholder {
-// 	color: #ffffff;
-// }
-
-// .placeholder {
-// 	color: #ffffff;
-// }
 </style>

pages/set/changePass.vue

@@ -0,0 +1,237 @@
+<template>
+	<view class="content">
+		<view class="box">
+			<!-- <view class="box-top">
+				<view class="shu" style="">
+
+				</view>
+				<view class="pass-title">
+					密码
+				</view>
+			</view> -->
+			<view class="box-bottom">
+				<view class="ipt">
+					<view class="text">
+						手机号
+					</view> <input type="phone" class="input" value="" placeholder="请输入手机号" />
+				</view>
+				<view class="ipt">
+					<view class="text">
+						新密码
+					</view> <input type="password" class="input" value="" placeholder="请输入新的密码" />
+				</view>
+				<view class="ipt">
+					 <view class="text">
+					 	重复密码
+					 </view><input type="password" class="input" value="" placeholder="请重复输入密码" />
+				</view>
+				<view class="ipt">
+					<view class="text">
+						验证码 
+					</view> <input type="number" class="input" value="" placeholder="请输入验证码"/>
+					<view class="yzm" @click="getDjs()" v-if="!isDjs">
+						验证码
+					</view>
+					<view class="yzm" v-else>
+						{{countDown}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<button class="button">确认</button>
+
+		<!-- 		<image style="z-index: 99;" src="../../static/game/game13.png" mode=""></image>
+		<image style="z-index: 99;" src="../../static/game/reb01.png" mode=""></image> -->
+	</view>
+</template>
+
+<script>
+	import {
+		verify
+	} from '@/api/login.js';
+	import {
+		mapState
+	} from 'vuex';
+	import {
+		registerReset
+	} from '@/api/set.js';
+	export default {
+		data() {
+			return {
+				phone:'',//手机号
+				time: '', //保存倒计时对象
+				countDown: 0, //倒计时
+				account: '', //手机号
+				captcha: '', //验证码
+				password: '', //新密码
+				loding: false, //是否载入中
+				isDjs:false,//是否在倒计时
+			};
+		},
+		computed: {
+			...mapState(['userInfo'])
+		},
+		onLoad() {
+			if (this.userInfo.phone == null) {
+				this.account = '';
+			} else {
+				this.account = this.userInfo.phone;
+				this.show = false;
+			}
+		},
+		watch: {
+			// 监听倒计时
+			countDown(i) {
+				if (i == 0) {
+					clearInterval(this.time);
+				}
+			}
+		},
+		methods: {
+			getDjs(){
+				this.isDjs = true
+				this.countDown= 10
+				let time = setInterval(e=>{
+					this.countDown--
+					console.log(this.countDown);
+					if(this.countDown==0){
+						clearInterval(time)
+						console.log('倒计时结束');
+						console.log(this.countDown,'打印');
+					}
+				},1000)
+			},
+
+			//发送验证码
+			verification() {
+				let obj = this;
+				if (this.account == '') {
+					this.$api.msg('请输入电话号码');
+					return;
+				}
+				if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.account)) {
+					this.$api.msg('请输入正确的手机号');
+					return;
+				}
+				// 判断是否在倒计时
+				if (obj.countDown > 0) {
+					return false;
+				} else {
+					obj.countDown = 60;
+					obj.time = setInterval(() => {
+						obj.countDown--;
+					}, 1000);
+					//调用验证码接口
+					verify({
+							phone: obj.account,
+							type: ''
+						})
+						.then(({
+							data
+						}) => {})
+						.catch(err => {
+							console.log(err);
+						});
+				}
+			},
+			confirm(e) {
+				this.loding = true;
+				registerReset({
+						account: this.account,
+						captcha: this.captcha,
+						password: this.password,
+					})
+					.then(({
+						data
+					}) => {
+						this.loding = false;
+						this.$api.msg('修改成功');
+					})
+					.catch(err => {
+						this.loding = false;
+						console.log(err);
+					});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		width: 750rpx;
+		height: 100%;
+		background: #111111;
+
+		.box {
+			background: #222222;
+			.box-top {
+				height: 100rpx;
+				display: flex;
+				align-items: center;
+
+				.shu {
+					width: 2rpx;
+					height: 30rpx;
+					background: #A581FF;
+					display: inline-block;
+					margin: 0 20rpx 0 30rpx;
+					line-height: 100rpx;
+				}
+
+				.pass-title {
+					line-height: 100rpx;
+					display: inline-block;
+					font-size: 30rpx;
+					font-weight: 500;
+					color: #FFFFFF;
+				}
+			}
+
+			.box-bottom {
+				margin-top: 50rpx;
+				
+				.ipt{
+					border-top:2rpx solid #F3F3F3;
+					padding: 0 30rpx;
+					display: flex;
+					align-items: center;
+					// justify-content: space-between;
+					
+					.text{
+						width: 150rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #FFFFFF;
+						line-height: 80rpx;
+					}
+					.input{
+						
+					}
+					.yzm{
+						margin-left: 140rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #A581FF;
+						line-height: 100rpx;
+					}
+				}
+			}
+
+		}
+
+		.button {
+			margin-top: 60rpx;
+			width: 600rpx;
+			height: 90rpx;
+			background: linear-gradient(270deg, #6E8DF7, #9977F6);
+			border-radius: 10px;
+
+			font-size: 30rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+			line-height: 90rpx;
+		}
+
+	}
+</style>

pages/set/gongao.vue

@@ -0,0 +1,56 @@
+<template>
+	<view class="content">
+		<view class="list">
+			<view class="list-content">
+				{{list}}
+			</view>
+			<view class="time">
+				{{time}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list:'水岸边阿是你的奶奶ID你阿森纳迪纳斯的那四年Indian设定阿萨德',
+				time:'2021-1-2 10:00:00'
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+page,.content{
+	padding: 0;
+	margin: 0;
+	height: 100%;
+	width: 750rpx;
+	background: #111111;
+	.list{
+		height: 130rpx;
+	padding: 20rpx  30rpx;
+	background: #222222;
+	border-bottom:2rpx solid #919295; ;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-around;
+	
+		.list-content{
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis; 
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+		}
+		.time{
+			font-size: 20rpx;
+			font-weight: 500;
+			color: #999999;
+		}
+	}
+}
+</style>

pages/set/password.vue

@@ -1,161 +1,236 @@
 <template>
-	<view class="container">
-		<view class="row b-b">
-			<text class="tit">手机号</text>
-			<input class="input" v-model="account" type="text" placeholder="请填写手机号" placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b">
-			<text class="tit">验证码</text>
-			<input class="input" v-model="captcha" type="text" placeholder="请填写验证码" placeholder-class="placeholder" />
-			<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
-		</view>
-		<view class="row b-b">
-			<text class="tit">新密码</text>
-			<input class="input" v-model="password" type="password" placeholder="请填写新密码" placeholder-class="placeholder" />
+	<view class="content">
+		<view class="box">
+			<view class="box-top">
+				<view class="shu" style="">
+
+				</view>
+				<view class="pass-title">
+					支付密码
+				</view>
+			</view>
+			<view class="box-bottom">
+				<view class="ipt">
+					<view class="text">
+						新密码
+					</view> <input type="password" class="input" value="" placeholder="请输入新的支付密码" />
+				</view>
+				<view class="ipt">
+					 <view class="text">
+					 	重复密码
+					 </view><input type="password" class="input" value="" placeholder="请重复输入支付密码" />
+				</view>
+				<view class="ipt">
+					<view class="text">
+						验证码 
+					</view> <input type="number" class="input" value="" placeholder="请输入验证码"/>
+					<view class="yzm" @click="getDjs()" v-if="!isDjs">
+						验证码
+					</view>
+					<view class="yzm" v-else>
+						{{countDown}}
+					</view>
+				</view>
+			</view>
 		</view>
-		<button class="add-btn" :class="{'bg-gray':loding}" @click="loding?'':confirm()">提交</button>
+		<button class="button" @click="navTo('/pages/money/success')">确认</button>
+
+		<!-- 		<image style="z-index: 99;" src="../../static/game/game13.png" mode=""></image>
+		<image style="z-index: 99;" src="../../static/game/reb01.png" mode=""></image> -->
 	</view>
 </template>
 
 <script>
-import { verify } from '@/api/login.js';
-import { mapState } from 'vuex';
-import { registerReset } from '@/api/set.js';
-export default {
-	data() {
-		return {
-			time: '', //保存倒计时对象
-			countDown: 0, //倒计时
-			account: '', //手机号
-			captcha: '', //验证码
-			password: '' ,//新密码
-			loding:false,//是否载入中
-		};
-	},
-	computed: {
-		...mapState(['userInfo'])
-	},
-	onLoad() {
-		if(this.userInfo.phone == null){
-			this.account = '';
-		}else{
-			this.account = this.userInfo.phone;
-			this.show = false;
-		}
-	},
-	watch: {
-		// 监听倒计时
-		countDown(i) {
-			if (i == 0) {
-				clearInterval(this.time);
-			}
-		}
-	},
-	methods: {
-		//发送验证码
-		verification() {
-			let obj = this;
-			if (this.account == '') {
-				this.$api.msg('请输入电话号码');
-				return;
+	import {
+		verify
+	} from '@/api/login.js';
+	import {
+		mapState
+	} from 'vuex';
+	import {
+		registerReset
+	} from '@/api/set.js';
+	export default {
+		data() {
+			return {
+				time: '', //保存倒计时对象
+				countDown: 0, //倒计时
+				account: '', //手机号
+				captcha: '', //验证码
+				password: '', //新密码
+				loding: false, //是否载入中
+				isDjs:false,//是否在倒计时
+			};
+		},
+		computed: {
+			...mapState(['userInfo'])
+		},
+		onLoad() {
+			if (this.userInfo.phone == null) {
+				this.account = '';
+			} else {
+				this.account = this.userInfo.phone;
+				this.show = false;
 			}
-			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.account)) {
-				this.$api.msg('请输入正确的手机号');
-				return;
+		},
+		watch: {
+			// 监听倒计时
+			countDown(i) {
+				if (i == 0) {
+					clearInterval(this.time);
+				}
 			}
-			// 判断是否在倒计时
-			if (obj.countDown > 0) {
-				return false;
-			} else {
-				obj.countDown = 60;
-				obj.time = setInterval(() => {
-					obj.countDown--;
-				}, 1000);
-				//调用验证码接口
-				verify({
-					phone: obj.account,
-					type: ''
-				})
-					.then(({ data }) => {})
+		},
+		methods: {
+			getDjs(){
+				this.isDjs = true
+				this.countDown= 10
+				let time = setInterval(e=>{
+					this.countDown--
+					console.log(this.countDown);
+					if(this.countDown==0){
+						clearInterval(time)
+						console.log('倒计时结束');
+						console.log(this.countDown,'打印');
+					}
+				},1000)
+			},
+
+			//发送验证码
+			verification() {
+				let obj = this;
+				if (this.account == '') {
+					this.$api.msg('请输入电话号码');
+					return;
+				}
+				if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.account)) {
+					this.$api.msg('请输入正确的手机号');
+					return;
+				}
+				// 判断是否在倒计时
+				if (obj.countDown > 0) {
+					return false;
+				} else {
+					obj.countDown = 60;
+					obj.time = setInterval(() => {
+						obj.countDown--;
+					}, 1000);
+					//调用验证码接口
+					verify({
+							phone: obj.account,
+							type: ''
+						})
+						.then(({
+							data
+						}) => {})
+						.catch(err => {
+							console.log(err);
+						});
+				}
+			},
+			confirm(e) {
+				this.loding = true;
+				registerReset({
+						account: this.account,
+						captcha: this.captcha,
+						password: this.password,
+					})
+					.then(({
+						data
+					}) => {
+						this.loding = false;
+						this.$api.msg('修改成功');
+					})
 					.catch(err => {
+						this.loding = false;
 						console.log(err);
 					});
-			}
-		},
-		confirm(e) {
-			this.loding = true;
-			registerReset({
-				account: this.account,
-				captcha: this.captcha,
-				password: this.password,
-			})
-				.then(({ data }) => {
-					this.loding = false;
-					this.$api.msg('修改成功');
+			},
+			navTo(url){
+				uni.navigateTo({
+					url
 				})
-				.catch(err => {
-					this.loding = false;
-					console.log(err);
-				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	background: $page-color-base;
-}
-.container {
-	padding-top: 30rpx;
-}
-.row {
-	display: flex;
-	align-items: center;
-	position: relative;
-	padding: 0 30rpx;
-	height: 110rpx;
-	background: #fff;
+	page,
+	.content {
+		width: 750rpx;
+		height: 100%;
+		background: #111111;
 
-	.tit {
-		flex-shrink: 0;
-		width: 120rpx;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.input {
-		flex: 1;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.iconlocation {
-		font-size: 36rpx;
-		color: $font-color-light;
-	}
-}
-.add-btn {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	margin: 60rpx auto;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: $base-color;
-	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
+		.box {
+			background: #222222;
+			.box-top {
+				height: 100rpx;
+				display: flex;
+				align-items: center;
+
+				.shu {
+					width: 2rpx;
+					height: 30rpx;
+					background: #A581FF;
+					display: inline-block;
+					margin: 0 20rpx 0 30rpx;
+					line-height: 100rpx;
+				}
+
+				.pass-title {
+					line-height: 100rpx;
+					display: inline-block;
+					font-size: 30rpx;
+					font-weight: 500;
+					color: #FFFFFF;
+				}
+			}
 
-.bg-gray{
-	background-color: $color-gray;
-}
-.code {
-	color: #5dbc7c;
-	font-size: 23rpx;
-	border-left: 1px solid #eeeeee;
-	width: 150rpx;
-	flex-shrink: 0;
-	text-align: center;
-}
+			.box-bottom {
+				
+				
+				.ipt{
+					border-top:2rpx solid #F3F3F3;
+					padding: 0 30rpx;
+					display: flex;
+					align-items: center;
+					// justify-content: space-between;
+					
+					.text{
+						width: 150rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #FFFFFF;
+						line-height: 80rpx;
+					}
+					.input{
+						
+					}
+					.yzm{
+						margin-left: 140rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #A581FF;
+						line-height: 100rpx;
+					}
+				}
+			}
+
+		}
+
+		.button {
+			margin-top: 60rpx;
+			width: 690rpx;
+			height: 80rpx;
+			background: linear-gradient(270deg, #6E8DF7, #9977F6);
+			border-radius: 40rpx;
+
+			font-size: 30rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+			line-height: 80rpx;
+		}
+
+	}
 </style>

pages/set/set.vue

@@ -1,101 +1,186 @@
 <template>
 	<view class="container">
-		<uni-list>
-			<uni-list-item title="个人资料" @click="navTo('/pages/set/userinfo')"></uni-list-item>
-			<!-- #ifdef APP-PLUS -->
-			<uni-list-item title="修改密码" @click="navTo('/pages/set/password')"></uni-list-item>
-			<!-- #endif -->
-			<!-- <uni-list-item title="绑定手机" @click="navTo('/pages/set/phone')"></uni-list-item> -->
-			<uni-list-item title="关于我们" @click="navTo('/pages/user/about')"></uni-list-item>
-			<uni-list-item title="隐私政策" @click="navTo('/pages/contract/privacy')"></uni-list-item>
-			<uni-list-item title="会员协议" @click="navTo('/pages/contract/agreement')"></uni-list-item>
-			<uni-list-item title="收货地址" @click="navTo('/pages/set/address')"></uni-list-item>
-		</uni-list>
+		<view class="box" @click="navTo('/pages/set/gongao')">
+			<view class="box-left">
+				<view class="img">
+					<image src="../../static/user/set01.png" mode=""  ></image>
+				</view>
+				<view class="title">
+					公告
+				</view>
+			</view>
+			<view class="img-right">
+				<image src="../../static/user/right01.png" mode=""></image>
+			</view>
+		</view>
+		<view class="box" @click="navTo('/pages/user/about')">
+			<view class="box-left">
+				<view class="img">
+					<image src="../../static/user/set02.png" mode=""></image>
+				</view>
+				<view class="title">
+					关于我们
+				</view>
+			</view>
+			<view class="img-right">
+				<image src="../../static/user/right01.png" mode=""></image>
+			</view>
+		</view>
+		<view class="box" 	@click="navTo('/pages/set/password')">
+			<view class="box-left">
+				<view class="img">
+					<image src="../../static/user/set03.png" mode=""></image>
+				</view>
+				<view class="title">
+					交易密码
+				</view>
+			</view>
+			<view class="img-right">
+				<image src="../../static/user/right01.png" mode=""></image>
+			</view>
+		</view>
 		<view class="list-cell log-out-btn" @click="toLogout"><text class="cell-tit">退出登录</text></view>
 	</view>
 </template>
 
 <script>
-import uniList from '@/components/uni-list/uni-list.vue';
-import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-import { logout } from '@/api/set.js';
-import { mapMutations } from 'vuex';
-export default {
-	components: {
-		uniList,
-		uniListItem
-	},
-	data() {
-		return {};
-	},
-	methods: {
-		...mapMutations('user', ['logout']),
-		navTo(url) {
-			uni.navigateTo({
-				url: url
-			});
+	import uniList from '@/components/uni-list/uni-list.vue';
+	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+	import {
+		logout
+	} from '@/api/set.js';
+	import {
+		mapMutations
+	} from 'vuex';
+	export default {
+		components: {
+			uniList,
+			uniListItem
 		},
-		//退出登录
-		toLogout() {
-			let obj = this;
-			uni.showModal({
-				content: '确定要退出登录么',
-				success: e => {
-					if (e.confirm) {
-						logout({})
-							.then(e => {
-								uni.navigateBack();
-							})
-							.catch(e => {
-								console.log(e);
-							});
-						obj.logout();
-					}
-				}
-			});
+		data() {
+			return {};
 		},
-		//switch切换触发方法
-		switchChange(e) {
-			console.log(e);
-			let statusTip = e.value ? '打开' : '关闭';
-			this.$api.msg(`${statusTip}消息推送`);
+		methods: {
+			...mapMutations('user', ['logout']),
+			navTo(url) {
+				uni.navigateTo({
+					url: url
+				});
+			},
+			//退出登录
+			toLogout() {
+				let obj = this;
+				uni.showModal({
+					content: '确定要退出登录么',
+					success: e => {
+						if (e.confirm) {
+							logout({})
+								.then(e => {
+									uni.navigateBack();
+								})
+								.catch(e => {
+									console.log(e);
+								});
+							obj.logout();
+						}
+					}
+				});
+			},
+			//switch切换触发方法
+			switchChange(e) {
+				console.log(e);
+				let statusTip = e.value ? '打开' : '关闭';
+				this.$api.msg(`${statusTip}消息推送`);
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	background: $page-color-base;
-}
-.list-cell {
-	display: flex;
-	align-items: baseline;
-	padding: 20rpx $page-row-spacing;
-	line-height: 60rpx;
-	position: relative;
-	background: #fff;
-	justify-content: center;
-	&.log-out-btn {
-		margin-top: 40rpx;
-		.cell-tit {
-			color: $uni-color-primary;
-			text-align: center;
-			margin-right: 0;
-		}
-	}
-	.cell-tit {
-		flex: 1;
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-		margin-right: 10rpx;
+	page {
+		background: #111111;
+		width: 750rpx;
+		height: 100%;
 	}
-	.cell-tip {
-		font-size: $font-base;
-		color: $font-color-light;
+
+	.box {
+		border-radius: 25rpx;
+		height: 85rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: 0 35rpx 30rpx 35rpx;
+		padding: 0 35rpx;
+		background: #222222;
+
+		.box-left {
+			display: flex;
+
+			.img {
+				width: 45rpx;
+				height: 40rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.title {
+				margin-left: 15rpx;
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 40rpx;
+			}
+		}
+
+		.img-right {
+			width: 14rpx;
+			height: 24rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
 	}
-	switch {
-		transform: translateX(16rpx) scale(0.84);
+
+	.list-cell {
+		display: flex;
+		align-items: baseline;
+		margin: 100rpx 30rpx 0 30rpx;
+		line-height: 80rpx;
+		height: 80rpx;
+		position: relative;
+		background: linear-gradient(270deg, #6E8DF7, #9977F6);
+		border-radius: 10rpx;
+		justify-content: center;
+
+		&.log-out-btn {
+			margin-top: 40rpx;
+
+			.cell-tit {
+				color: #fff;
+				text-align: center;
+				margin-right: 0;
+			}
+		}
+
+		.cell-tit {
+			flex: 1;
+			font-size: $font-base + 2rpx;
+			color: $font-color-dark;
+			margin-right: 10rpx;
+		}
+
+		.cell-tip {
+			font-size: $font-base;
+			color: $font-color-light;
+		}
+
+		switch {
+			transform: translateX(16rpx) scale(0.84);
+		}
 	}
-}
 </style>

pages/user/feedback.vue

@@ -0,0 +1,132 @@
+<template>
+	<view>
+		<textarea name="" class="text-area" cols="30" rows="10" :value="value"
+			placeholder="请提出您遇到的问题,或者反馈意见~"></textarea>
+		<view class="imgg">
+			<view class="chooseImg" v-for="(item,index) in imgList">
+				<image :src="item" mode=""></image>
+				<image src="../../static/user/delete.png" class="del" mode="" @click="dele(index)"></image>
+			</view>
+			<view class="chooseImg" @click="shangchaun">
+
+				<image src="../../static/img/chooseImg.png" mode=""></image>
+			</view>
+		</view>
+		<view class="button">
+			提交
+		</view>
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				value: '', //反馈内容
+				imgList: [] //照片
+			}
+		},
+		methods: {
+			//上传图片
+			shangchaun() {
+				let obj = this
+				uni.chooseImage({
+					count: 3,
+					sizeType: ['original', 'compressed'],
+
+					success(res) {
+						console.log(res);
+						if (res.tempFilePaths.length != 0) {
+							obj.imgList.push(res.tempFilePaths[0]);
+						}
+						console.log(JSON.stringify(res.tempFilePaths));
+						let tempFilePaths = res.tempFilePaths;
+
+						console.log(tempFilePaths);
+						console.log(tempFilePaths[0]);
+						// uni.uploadFile({
+						// 	url: 'http://douzhuoqianshouba.xieenguoji.com/api/ajax/upload',
+						// 	filePath: tempFilePaths[0],
+						// 	name: 'file',
+						// 	success: uploadFileRes => {
+						// 		console.log('上传图片', JSON.parse(uploadFileRes.data));
+
+						// 	}
+						// })
+					},
+				})
+			},
+			dele(index) {
+				console.log('删除');
+				this.imgList.splice(index, 1)
+				console.log(this.imgList);
+
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		width: 750rpx;
+		height: 100%;
+		margin: 0;
+		padding: 0;
+		background: #111111;
+
+		.text-area {
+			color: aliceblue;
+			width: 750rpx;
+			height: 200rpx;
+			background: #181818;
+			padding: 40rpx 20rpx;
+		}
+
+		.imgg {
+
+			display: flex;
+			flex-grow: 4;
+			flex-grow: 4;
+
+
+		}
+
+		
+
+		.chooseImg {
+			position: relative;
+			border-radius: 20rpx;
+			width: 160rpx;
+			height: 160rpx;
+			margin: 20rpx;
+			.del {
+				width: 40rpx;
+				height: 40rpx;
+				position: absolute;
+				z-index: 1000;
+				top:0;
+				right: 0;
+			}
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+	.button{
+		width: 560rpx;
+		height: 90rpx;
+		background: linear-gradient(270deg, #6E8DF7, #9977F6);
+		border-radius: 45rpx;
+		font-size: 36rpx;
+		font-weight: 500;
+		color: #FFFFFF;
+		margin: 50rpx auto;
+		text-align: center;
+		line-height: 90rpx;
+	}
+</style>

pages/user/personal.vue

@@ -0,0 +1,139 @@
+<template>
+	<view class="content">
+		<view class="box" style="margin-top: 60rpx;">
+			<view class="left">
+				头像
+			</view>
+			<view class="right" @click="chooseImg" v-if="img==''">
+				<image class="img" :src="userInfo.avatar" mode=""></image>
+			</view>
+			<view class="right" v-else @click="chooseImg">
+				<image class="img" :src="img" mode=""></image>
+			</view>
+
+		</view>
+		<view class="box">
+			<view class="left">
+				昵称
+			</view>
+			<view class="right">
+				{{name}}
+			</view>
+		</view>
+		<view class="box">
+			<view class="left">
+				手机号
+			</view>
+			<view class="right">
+				{{phone}}
+			</view>
+		</view>
+		<view class="box">
+			<view class="left">
+				实名认证
+			</view>
+			<view class="right" @click="navTo('/pages/user/realName')">
+				未认证 >
+			</view>
+
+		</view>
+		<button class="button">提交</button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		upload
+	} from '@/api/order.js'
+	export default {
+		data() {
+			return {
+				name: '姓名',
+				phone: '18252757278',
+				img: '',
+			};
+		},
+		computed: {
+			...mapState('user', ['userInfo'])
+		},
+		methods: {
+			chooseImg() {
+				let obj = this
+				uni.chooseImage({
+					count: 1,
+					sourceType: ['album'], //从相册选择
+					success: (e) => {
+						console.log(e, 'eeee');
+						console.log(obj.userInfo, 'userinfo');
+						obj.img = e.tempFilePaths[0]
+						// upload({
+						//  	filename: ''
+						// }).then(res=>{
+						//  console.log(res,'res');
+						//  	obj.img = res[0].url
+						// })
+					}
+				})
+			},
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		background: #111111;
+		width: 750rpx;
+		height: 100%;
+
+		.box {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin: 0 30rpx;
+			border-bottom: 2rpx solid #AEAEAE;
+			padding: 30rpx 40rpx;
+
+			.left {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.right {
+				font-size: 26rpx;
+				font-weight: 400;
+				color: #FFFFFF;
+
+				.img {
+					width: 80rpx;
+					height: 80rpx;
+					border-radius: 50%;
+					overflow: hidden;
+				}
+			}
+		}
+
+		.button {
+			margin-top: 160rpx;
+			width: 690rpx;
+			height: 80rpx;
+			background: linear-gradient(270deg, #6E8DF7, #9977F6);
+			border-radius: 10rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 80rpx;
+			
+		}
+	}
+</style>

pages/user/realName.vue

@@ -0,0 +1,87 @@
+<template>
+	<view class="content">
+		<view class="box" style="margin-top: 70rpx;">
+			<view class="left">昵称</view>
+			<view class="right"><input type="text" placeholder="请输入真实姓名"></view>
+		</view>
+		<view class="box">
+			<view class="left">身份证号</view>
+			<view class="right"><input type="number" placeholder="请输入身份证号"></view>
+		</view>
+		<view class="box">
+			<view class="left">手机号</view>
+			<view class="right"><input type="number" placeholder="请输入手机号"></view>
+		</view>
+		<view class="box">
+			<view class="left">银行卡号</view>
+			<view class="right"><input type="number" placeholder="请输入银行卡号"></view>
+		</view>
+		<button @click="navTo('/pages/money/success')" class="button">提交认证</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		methods:{
+			navTo(url){
+				uni.navigateTo({
+				url
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		background: #111111;
+		height: 100%;
+		width: 750rpx;
+
+		.box {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin: 0 30rpx;
+			border-bottom: 2rpx solid #AEAEAE;
+			padding: 30rpx 40rpx;
+
+			.left {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.right {
+				font-size: 26rpx;
+				font-weight: 400;
+				color: #FFFFFF;
+
+				.img {
+					width: 80rpx;
+					height: 80rpx;
+					border-radius: 50%;
+					overflow: hidden;
+				}
+			}
+		}
+
+		.button {margin-top: 100rpx;
+			width: 690rpx;
+			height: 80rpx;
+			background: linear-gradient(270deg, #6E8DF7, #9977F6);
+			border-radius: 10rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 80rpx;
+		}
+	}
+</style>

pages/user/user.vue

@@ -1,128 +1,100 @@
 <template>
 	<view class="container">
-		<!-- #ifdef APP-PLUS -->
-		<!-- <view class="vheigh"></view> -->
-		<!-- #endif -->
-		<view class="user-top"><image src="../../static/img/user01.png" mode="" class="user-top-bg"></image></view>
-		<view class="user-info">
-			<image @click="navTo('/pages/set/set')" class="avtar" :src="userInfo.avatar" mode=""></image>
-			<!-- <view class="name">{{ userInfo.nickname }}</view> -->
-			<view @click="navTo('/pages/set/set')" class="phone">{{ userInfo.phone | phone }}</view>
-			<view @click="navTo('/pages/set/set')" class="vip-box">
-				<view class="vip">
-					<image class="vip-bg" src="../../static/img/vip.png" mode=""></image>
-					<view class="vip-title">V{{ userInfo.level }}</view>
-				</view>
+		<view class="title-box">
+			<view class="title-img">
+				<image :src="userInfo.avatar" mode=""></image>
 			</view>
-			<!-- <view class="sy-box flex">
-				<view class="sy-item" @click="navTo('/pages/user/whiteJf')">
-					<view class="sy-item-name">我的肥料</view>
-					<view class="sy-item-val">{{ userInfo.white_integral || '0.00' }}</view>
-				</view>
-				<view class="jg"></view>
-				<view class="sy-item" @click="navTo('/pages/user/greenJf')">
-					<view class="sy-item-name">我的水滴</view>
-					<view class="sy-item-val">{{ userInfo.green_integral || '0.00' }}</view>
+			<view class="title-tit">
+				<view class="title-top">
+					{{userInfo.nickname || '游客'}}
 				</view>
-				<view class="jg"></view>
-				<view class="sy-item" @click="navTo('/pages/user/myGreenCard')">
-					<view class="sy-item-name">我的洒水壶</view>
-					<view class="sy-item-val">{{ greenNum }}</view>
+				<view class="title-bottom">
+					{{userInfo.phone}}
 				</view>
-			</view> -->
+			</view>
 		</view>
-		<view class="item-box">
-			<view class="order-section">
-				<view class="order-item" @click="navTo('/pages/user/whiteJf')" hover-class="common-hover" :hover-stay-time="50">
-					<view class="icon"><image class="icon-img" src="/static/icon/myyj.png" mode="aspectFit"></image></view>
-					<text>我的肥料</text>
-				</view>
-				<view class="order-item" @click="navTo('/pages/user/mallJf')" hover-class="common-hover" :hover-stay-time="50">
-					<view class="icon"><image class="icon-img" src="/static/icon/myyj.png" mode="aspectFit"></image></view>
-					<text>我的阳光</text>
-				</view>
-				<view class="order-item" @click="navTo('/pages/user/team')" hover-class="common-hover" :hover-stay-time="50">
-					<view class="icon"><image class="icon-img" src="/static/icon/myjd.png" mode="aspectFit"></image></view>
-					<text>我的推广</text>
-				</view>
+		<view class="address-box">
+			<view class="address-text">
+				区块链地址:{{name}}
+			</view>
+			<view class="fuzhi" @click="cope(name)">
+				复制
 			</view>
 		</view>
-		<!-- 订单 -->
-		<view class="item-box item-box-b">
-			<view class="box-title flex ">
-				<view class="title"><text>我的订单</text></view>
-				<view class="link" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover"><text class="iconfont iconenter"></text></view>
+		<view class="btm" style="height: 44px;"></view>
+		<view class="manage-box">
+			<view class="manage" @click="navTo('/pages/money/wallet')">
+				<image src="../../static/user/user06.png" mode=""></image>
+				<view class="manage-title">
+					钱包
+				</view>
 			</view>
-			<view class="order-section">
-				<view class="order-item" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover" :hover-stay-time="50">
-					<view class=" icon position-relative">
-						<image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image>
-						<view class="corner" v-if="orderInfo.unpaid_count > 0">
-							<text>{{ orderInfo.unpaid_count }}</text>
-						</view>
-					</view>
-					<text>待付款</text>
+			<view class="manage" @click="navTo('/pages/user/personal')">
+				<image src="../../static/user/user08.png" mode=""></image>
+				<view class="manage-title">
+					实名认证
 				</view>
-				<view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover" :hover-stay-time="50">
-					<view class=" icon position-relative">
-						<image class="icon-img" src="/static/icon/i2.png" mode="aspectFit"></image>
-						<view class="corner" v-if="orderInfo.unshipped_count > 0">
-							<text>{{ orderInfo.unshipped_count }}</text>
-						</view>
-					</view>
-					<text>待发货</text>
+			</view>
+			<view class="manage" @click="kfOpen()" >
+				<image src="../../static/user/user05.png" mode=""></image>
+				<view class="manage-title">
+					邀请好友
 				</view>
-				<view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover" :hover-stay-time="50">
-					<view class="icon position-relative">
-						<image class="icon-img" src="/static/icon/i3.png" mode="aspectFit"></image>
-						<view class="corner" v-if="orderInfo.received_count > 0">
-							<text>{{ orderInfo.received_count }}</text>
-						</view>
-					</view>
-					<text>待收货</text>
+			</view>
+			<view class="manage">
+				<image src="../../static/user/user09.png" mode=""></image>
+				<view class="manage-title">
+					提交意见
 				</view>
-				<view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">
-					<view class="icon position-relative">
-						<image class="icon-img" src="/static/icon/i4.png" mode="aspectFit"></image>
-						<!-- <view class="corner" v-if="orderInfo.complete_count > 0">
-							<text>{{ orderInfo.complete_count }}</text>
-						</view> -->
-					</view>
-					<text>已完成</text>
+			</view>
+			<view class="manage" @click="navTo('/pages/set/set')">
+				<image src="../../static/user/user07.png" mode=""></image>
+				<view class="manage-title" @click="navTo('/pages/user/feedback')">
+					设置
 				</view>
 			</view>
 		</view>
-		<!--  -->
-		<view class="btm-box flex" @click="navTo('/pages/user/favorites')">
-			<image src="../../static/icon/mytg.png" mode="widthFix" class="left-img"></image>
-			<view class="">我的收藏</view>
-			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
-		</view>
-		<!-- <view class="btm-box flex" @click="navTo('/pages/user/shareQrCode')">
-			<image src="../../static/icon/tghb.png" mode="widthFix" class="left-img"></image>
-			<view class="">推广海报</view>
-			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
-		</view> -->
-		<view class="btm-box flex" @click="navTo('/pages/set/address')">
-			<image src="../../static/icon/shdz.png" mode="widthFix" class="left-img"></image>
-			<view class="">收货地址</view>
-			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
-		</view>
-		<view class="btm-box flex" @click="kfOpen">
-			<image src="../../static/icon/kf.png" mode="widthFix" class="left-img"></image>
-			<view class="">客服</view>
-			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
-		</view>
-		<view class="btm-box flex" @click="navTo('/pages/set/set')">
-			<image src="../../static/icon/bdsj.png" mode="widthFix" class="left-img"></image>
-			<view class="">设置</view>
-			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
+		<view class="navbar">
+			<view class="nav-item" v-for="(item,index) in navList" :class="{current:tabCurrentIndex===index}"
+				@click="navGet(index)">
+				{{item.text}}
+			</view>
 		</view>
-		<view class="btm" style="height: 44px;"></view>
+		<swiper :current="tabCurrentIndex" duration="300" class="swiper-box" :style="{ height: height }" @change="changeTab">
+			<swiper-item>
+				<scroll-view scroll-y="true" class="uni-scroll-view-content">
+					<view class="box-content">
+						<view class="img">
+							<image src="../../static/index/nvwang.png" mode=""></image>
+						</view>
+						<view class="content-title">
+							<view class="title">
+								<view class="text">
+									黑道女王
+								</view>
+								<view class="zm">
+									转卖中
+								</view>
+							</view>
+							<view class="content-price">
+								<view class="price">
+									￥66.60
+								</view>
+								<view class="button" @click="navPop()">
+									卖出
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
 		<!-- 客服 -->
 		<uni-popup ref="popupkf" type="center">
 			<view class="popup-box">
-				<view class="img"><image src="../../static/img/img009.png" mode=""></image></view>
+				<view class="img">
+					<image src="../../static/img/img009.png" mode=""></image>
+				</view>
 				<view class="mian">
 					<view class="delivery">
 						<view class="title">已经为您定制专属客服</view>
@@ -136,451 +108,541 @@
 				</view>
 			</view>
 		</uni-popup>
+		<uni-popup ref="maipop" type="center">
+			<view class="mai-box">
+				<view class="mai-title">
+					卖出价格
+				</view>
+				<input type="number">
+				<view class="mai-button">
+					<view class="button-left" @click="maiClose()">
+						取消
+					</view>
+					<view class="button-right">
+						确定
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 <script>
-import { mapState, mapMutations } from 'vuex';
-import uniList from '@/components/uni-list/uni-list.vue';
-import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-import { orderData, userinfo, greenList } from '@/api/user.js';
-import { saveUrl, interceptor } from '@/utils/loginUtils.js';
-import uniCopy from '@/js_sdk/xb-copy/uni-copy.js';
-let startY = 0,
-	moveY = 0,
-	pageAtTop = true;
-export default {
-	components: {
-		uniList,
-		uniListItem
-	},
-	data() {
-		return {
-			greenNum: 0,
-			text: 'weilegou1',
-			coverTransform: 'translateY(0px)',
-			coverTransition: '0s',
-			moving: false,
-			userDowm: 0, //卡片升级专属高度
-			userMaxDowm: 0 //卡片最高高度
-		};
-	},
-	filters: {
-		phone(value) {
-			if (value != null) {
-				var subStr1 = value.substr(0, 3);
-				var subStr2 = value.substr(value.length - 4, 4);
-				var subStr = subStr1 + '***' + subStr2;
-				console.log(subStr);
-				value = subStr;
-				return value;
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import uniList from '@/components/uni-list/uni-list.vue';
+	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+	import {
+		orderData,
+		userinfo,
+		greenList
+	} from '@/api/user.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	import uniCopy from '@/js_sdk/xb-copy/uni-copy.js';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			uniList,
+			uniListItem
+		},
+		data() {
+			return {
+				height: '',
+				// 头部图高度
+				maxheight: '',
+				tabCurrentIndex: 0,
+				greenNum: 0,
+				text: 'weilegou1',
+				coverTransform: 'translateY(0px)',
+				coverTransition: '0s',
+				moving: false,
+				userDowm: 0, //卡片升级专属高度
+				userMaxDowm: 0, //卡片最高高度
+				name: 'zyjshiwoshanver',
+				navList: [{
+					state: 0,
+					text: '我拥有的',
+					loadingType: 'more',
+					orderList: [],
+					page: 1,
+					limit: 10
+				}, {
+					state: 1,
+					text: '我卖出的',
+					loadingType: 'more',
+					page: 1,
+					limit: 10
+				}]
+			};
+		},
+		filters: {
+
+		},
+		onShow() {
+			// if(this.hasLogin){
+			// 	console.log(this.hasLogin,this.userInfo,'我已登录');
+			// }
+		},
+		onReady() {
+			if(this.hasLogin){
+				console.log(this.hasLogin,this.userInfo,'我已登录');
 			}
-		}
-	},
-	onShow() {
-		this.loadBaseData();
-		// 判断是否已经登录
-		if (this.hasLogin) {
-			this.loadBaseData();
-			this.getGreenList();
-		}
-	},
-	onReady() {
-		// 初始化获取页面宽度
-		uni.createSelectorQuery()
-			.select('.container')
-			.fields(
-				{
-					size: true
+			var _this = this;
+			
+			// 初始化获取页面宽度
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					console.log(resu, 'query');
+					query.select('.swiper-box').boundingClientRect();
+					query.exec(function(res) {
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
+					});
 				},
-				data => {
-					// 计算最多下拉的高度
-					this.userDowm = Math.floor((data.width / 750) * 185);
-					// 计算最大触发修改高度事件
-					this.userMaxDowm = Math.floor((data.width / 750) * 250);
-				}
-			)
-			.exec();
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-
-		// 绿卡记录
-		getGreenList() {
-			greenList({}).then(res => {
-				console.log('greenList', res);
-				this.greenNum = res.data.count;
+				fail: res => {}
 			});
 		},
-		// 加载初始数据
-		loadBaseData() {
-			console.log(this.userInfo);
-			userinfo({})
-				.then(({ data }) => {
-					this.setUserInfo(data);
-					// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
-					orderData({})
-						.then(({ data }) => {
-							this.setOrderInfo(data);
-						})
-						.catch(e => {
-							this.setOrderInfo({
-								complete_count: 0, //完成
-								received_count: 0, //待收货
-								unshipped_count: 0, //待发货
-								order_count: 0, //订单总数
-								unpaid_count: 0 //待付款
-							});
-						});
-				})
-				.catch(e => {
-					console.log(e);
-				});
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 		},
-		/**
-		 * 统一跳转接口,拦截未登录路由
-		 * navigator标签现在默认没有转场动画，所以用view
-		 */
-		navTo(url) {
-			if (url == '') {
-				this.$api.msg('敬请期待');
-			}
-			if (!this.hasLogin) {
-				// 保存地址
-				saveUrl();
-				// 登录拦截
-				interceptor();
-			} else {
-				uni.navigateTo({
-					url,
-					fail() {
-						uni.switchTab({
-							url
-						});
+		methods: {
+			navPop(){
+				this.$refs.maipop.open()
+			},
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			navGet(index) {
+				this.tabCurrentIndex = index
+			},
+			//swiper切换
+			changeTab(e){
+				this.tabCurrentIndex= e.target.current
+				this.loadData('tabChange')
+			},
+			async loadData(sourse){},
+			//复制
+			cope(name) {
+				uni.setClipboardData({
+					data: this.name,
+					success() {
+						uni.showToast({
+							title: '复制成功'
+						})
 					}
-				});
-			}
-		},
-		kfOpen() {
-			this.$refs.popupkf.open();
-		},
-		kfClose() {
-			this.$refs.popupkf.close();
-		},
-		comfirm(text) {
-			console.log(text);
-			const result = uniCopy(text);
-			if (result === false) {
-				uni.showToast({
-					title: '不支持'
-				});
-			} else {
-				uni.showToast({
-					title: '复制成功',
-					icon: 'none'
-				});
+				})
+			},
+			navTo(url) {
+				
+				
+				if (url == '') {
+					this.$api.msg('敬请期待');
+				}
+				//判断是否登录了,没有等去,请去登录
+				if (!this.hasLogin) {
+					//保存地址
+					saveUrl();
+					// 登录拦截
+					interceptor();
+					// uni.showModal({
+					// 	title:'去登录'
+					// })
+					// uni.navigateTo({
+					// 	url,
+					// 	fail() {
+					// 		uni.switchTab({
+					// 			url
+					// 		});
+					// 	}
+					// });
+				} else {
+					uni.navigateTo({
+						url,
+						fail() {
+							uni.switchTab({
+								url
+							});
+						}
+					});
+				}
+			},
+			kfOpen() {
+				this.$refs.popupkf.open();
+			},
+			kfClose() {
+				this.$refs.popupkf.close();
+			},
+			maiClose(){
+				this.$refs.maipop.close();
 			}
-			this.$refs.popup.close();
+
 		}
-	}
-};
+	};
 </script>
 <style lang="scss">
-page {
-	height: 100%;
-}
-
-.vheigh {
-	height: var(--status-bar-height);
-}
-
-.user-top {
-	height: 500rpx;
-	position: relative;
-
-	.user-top-bg {
-		width: 750rpx;
-		height: 500rpx;
-	}
-}
-
-.user-info {
-	width: 708rpx;
-	background: #fff;
-	border-radius: 28rpx;
-	background-color: white;
-	margin: -280rpx auto 30rpx;
-	position: relative;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	padding: 40rpx 0;
-	.avtar {
-		width: 134rpx;
-		height: 134rpx;
-		border-radius: 50%;
-	}
-	.phone {
-		margin-top: 8rpx;
-		font-size: 29rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #000;
+	page {
+		height: 100%;
+		background: #111111;
+		padding: 30rpx;
 	}
-	.vip-box {
-		margin-top: 10rpx;
+	
+	.mai-box{
 		display: flex;
+		flex-direction: column;
 		align-items: center;
-		line-height: 1;
-		.vip {
-			position: relative;
-			margin-left: 12rpx;
-			width: 130rpx;
-			height: 40rpx;
-			.vip-bg {
-				position: absolute;
-				top: 0;
-				left: 0;
-				right: 0;
-				width: 100%;
-				height: 100%;
+		justify-content: space-around;
+		width: 582rpx;
+		height: 377rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		.mai-title{
+			font-size: 42rpx;
+			font-weight: 500;
+			color: #0C1732;
+			line-height: 56rpx;
+		}
+		input{
+			width: 494rpx;
+			height: 90rpx;
+			font-size: 40rpx;
+			background: rgba(199,212,255,0.3500);
+			border-radius: 10rpx;
+			text-align: center;
+		}
+		.mai-button{
+			display: flex;
+			width: 90%;
+			justify-content: space-between;
+			.button-left{
+				text-align: center;
+				width: 248rpx;
+				height: 78rpx;
+				border: 2rpx solid #A581FF;
+				border-radius: 10rpx;
+				font-size: 34rpx;
+				font-weight: 500;
+				color: #A581FF;
+				line-height: 78rpx;
 			}
-			.vip-title {
-				position: relative;
-				z-index: 10;
-				font-size: 20rpx;
-				font-family: PingFang SC;
+			.button-right{
+				text-align: center;
+				width: 248rpx;
+				height: 78rpx;
+				background: linear-gradient(270deg, #6E8DF7, #9977F6);
+				border-radius: 10rpx;
+				font-size: 34rpx;
 				font-weight: 500;
-				color: #93794b;
-				padding-left: 46rpx;
-				line-height: 40rpx;
+				color: #FFFFFF;
+				line-height: 78rpx;
 			}
 		}
 	}
-	.sy-box {
-		width: 100%;
-		margin-top: 40rpx;
-		.sy-item {
-			width: 30%;
-			flex-grow: 1;
-			text-align: center;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #000;
 
-			.sy-item-val {
-				font-size: 39rpx;
+	.title-box {
+		margin: 40rpx 0;
+		display: flex;
+		align-items: center;
+
+		.title-img {
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
 			}
 		}
 
-		.jg {
-			width: 2rpx;
-			height: 30rpx;
-			background-color: #b6b6b6;
-		}
-	}
-}
-%flex-center {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-}
-
-%section {
-	display: flex;
-	justify-content: space-around;
-	align-content: center;
-	background: #fff;
-	border-radius: 10rpx;
-}
-.item-box {
-	width: 708rpx;
-	height: 163rpx;
-	background: #fff;
-	border-radius: 28rpx;
-	background-color: white;
-	margin: 20rpx auto 30rpx;
-	position: relative;
-
-	// margin-top: 20rpx;
-	.box-title {
-		line-height: 1;
-		padding: 30rpx;
+		.title-tit {
+			margin-left: 30rpx;
 
-		.title {
-			font-size: $font-lg;
-			font-weight: bold;
-		}
+			.title-top {
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 50rpx;
+			}
 
-		.link {
-			font-size: $font-base - 2rpx;
-			color: $font-color-light;
+			.title-bottom {
+				font-size: 22rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 40rpx;
+			}
 		}
 	}
+	
 
-	.order-section {
-		@extend %section;
-		padding: 28rpx 0;
+	.address-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: 0 30rpx;
+		height: 60rpx;
+		background: #181818;
+		border: 2rpx solid #7D5FA4;
+		border-radius: 8rpx;
+		font-size: 20rpx;
+		font-weight: 500;
+		line-height: 61rpx;
+		color: #5C5EE5;
 
-		.order-item {
-			@extend %flex-center;
-			width: 120rpx;
-			height: 120rpx;
-			border-radius: 10rpx;
-			font-size: $font-sm;
-			color: $font-color-dark;
+		.address-text {
+			margin: 0 25rpx;
+			width: 520rpx;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
 		}
 
-		.iconfont {
-			font-size: 48rpx;
-			margin-bottom: 18rpx;
-			color: #fa436a;
-		}
+		.fuzhi {
+			width: 86rpx;
+			height: 40rpx;
+			border-radius: 10rpx;
+			border: 2px solid #7D5FA4;
+			text-align: center;
+			line-height: 32rpx;
+			margin-right: 40rpx;
 
-		.icon-shouhoutuikuan {
-			font-size: 44rpx;
 		}
+	}
 
-		.icon {
-			height: 50rpx;
-			width: 48rpx;
-			margin-bottom: 18rpx;
-			background-size: 100%;
-			background-repeat: no-repeat;
-			background-position: center;
+	.manage-box {
+		display: flex;
+		justify-content: left;
+		background: #181818;
+		border-radius: 30rpx;
+		flex-wrap: wrap;
 
-			.icon-img {
-				width: 100%;
-				height: 100%;
+		.manage {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin: 30rpx 0 20rpx;
+			width: 25%;
+
+			image {
+				width: 42rpx;
+				height: 42rpx;
+				margin-bottom: 15rpx;
+			}
+
+			.manage-title {
+				font-size: 24rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 42rpx;
 			}
 		}
 	}
-}
-
-.item-box-b {
-	width: 710rpx;
-	height: 221rpx;
-	background: #ffffff;
-	margin: 20rpx auto 60rpx;
-}
-
-.btm-box {
-	width: 706rpx;
-	height: 104rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 28rpx;
-	margin: 20rpx auto;
-	position: relative;
-	padding: 0 33rpx 0 24rpx;
-	font-size: 29rpx;
-	font-weight: bold;
-	color: #5d5d5d;
-	.left-img {
-		width: 40rpx;
-	}
-	.right-img {
-		width: 14rpx;
-	}
-	view {
-		flex-grow: 1;
-		padding-left: 12rpx;
-	}
-}
 
-.popup-box {
-	width: 522rpx;
-	height: 605rpx;
-	background-color: #ffffff;
-	border-radius: 20rpx;
-	position: relative;
+	.vheigh {
+		height: var(--status-bar-height);
+	}
 
-	.img {
-		position: relative;
-		top: -56rpx;
-		left: 0;
-		width: 522rpx;
-		height: 132rpx;
+	.navbar {
+		margin-top: 30rpx;
 		display: flex;
-		justify-content: center;
 
-		image {
-			border-radius: 20rpx 20rpx 0 0;
-			width: 450rpx;
-			height: 132rpx;
+		justify-content: space-around;
+		font-size: 24rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #999999;
+		line-height: 42rpx;
+
+		.current {
+			color: #5C5EE5;
 		}
+
 	}
 
-	.mian {
-		margin-top: -44rpx;
+	.uni-scroll-view-content {
+		height: 100%;
+	}
+
+	.box {
 		display: flex;
-		flex-direction: column;
-		align-items: center;
-		// padding: 32rpx 32rpx;
-		background-color: #ffffff;
-		border-radius: 0 0 20rpx 20rpx;
-		text-align: center;
+		// justify-content: space-around;
+		flex-wrap: wrap;
+		width: 750rpx
+	}
 
-		.delivery {
-			font-size: 40rpx;
-			color: #333333;
+	.box-content {
+
+		width: 330rpx;
+		height: 415rpx;
+		margin: 50rpx 15rpx;
+
+		.img {
+			width: 330rpx;
+			height: 280rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.content-title {
+			z-index: 99;
 			display: flex;
-			align-items: center;
+
+			margin-top: -10rpx;
+			padding: 20rpx;
 			flex-direction: column;
+			border-bottom-left-radius: 10rpx;
+			border-bottom-right-radius: 10rpx;
+			border: 2rpx solid #533A6A;
+			// box-shadow: 0px 0px 20rpx 0px rgba(79,59,103,0.0600);
 
 			.title {
+				display: flex;
+				// font-size: 39rpx;
+				// font-weight: bold;
+				// color: #FFFFFF;
+				// margin-bottom: 20rpx;
+
 			}
 
-			image {
-				margin-top: 48rpx;
-				width: 172rpx;
-				height: 160rpx;
+			.zm {
+				margin: 10rpx;
+				width: 63rpx;
+				height: 30rpx;
+				border: 1rpx solid #5C5EE5;
+				border-radius: 5rpx;
+				font-size: 16rpx;
+				font-weight: 500;
+				color: #5C5EE5;
+				line-height: 30rpx;
+				text-align: center;
 			}
-		}
 
-		.nocancel {
-			font-size: 32rpx;
-			color: #333333;
-			margin-top: 14rpx;
+			.text {
+				color: #FFFFFF;
+				font-size: 24rpx;
+				margin: 10rpx 0;
+			}
 		}
 
-		.comfirm-box {
-			margin-top: 52rpx;
+		.content-price {
 			display: flex;
-			// margin-bottom: 32rpx;
+			justify-content: space-between;
 
-			// justify-content: space-around;
-			.cancel {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 197rpx;
-				height: 74rpx;
-				border: 1px solid #dcc786;
-				border-radius: 38rpx;
-
-				font-size: 32rpx;
-				color: #605128;
+			.price {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
 			}
 
-			.comfirm {
-				margin-left: 32rpx;
+			.button {
+				width: 104rpx;
+				height: 35rpx;
+				background: linear-gradient(270deg, #6E8DF7, #9977F6);
+				border-radius: 18rpx;
+				font-size: 20rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 35rpx;
+				text-align: center;
+			}
+		}
+	}
+	.popup-box {
+		width: 522rpx;
+		height: 605rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		position: relative;
+	
+		.img {
+			position: relative;
+			top: -56rpx;
+			left: 0;
+			width: 522rpx;
+			height: 132rpx;
+			display: flex;
+			justify-content: center;
+	
+			image {
+				border-radius: 20rpx 20rpx 0 0;
+				width: 450rpx;
+				height: 132rpx;
+			}
+		}
+	
+		.mian {
+			margin-top: -44rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 32rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 20rpx 20rpx;
+			text-align: center;
+	
+			.delivery {
+				font-size: 40rpx;
+				color: #333333;
 				display: flex;
 				align-items: center;
-				justify-content: center;
-				width: 197rpx;
-				height: 74rpx;
-				background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
-				border-radius: 38px;
+				flex-direction: column;
+	
+				.title {}
+	
+				image {
+					margin-top: 48rpx;
+					width: 172rpx;
+					height: 160rpx;
+				}
+			}
+	
+			.nocancel {
 				font-size: 32rpx;
-				color: #605128;
+				color: #333333;
+				margin-top: 14rpx;
+			}
+	
+			.comfirm-box {
+				margin-top: 52rpx;
+				display: flex;
+				// margin-bottom: 32rpx;
+	
+				// justify-content: space-around;
+				.cancel {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					border: 1px solid #dcc786;
+					border-radius: 38rpx;
+	
+					font-size: 32rpx;
+					color: #605128;
+				}
+	
+				.comfirm {
+					margin-left: 32rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+					border-radius: 38px;
+					font-size: 32rpx;
+					color: #605128;
+				}
 			}
 		}
 	}
-}
 </style>

store/index.js

@@ -12,7 +12,7 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL: 'http://wlgogo.cn', //请求地址配置 
+		baseURL:"http://bsn.frp.liuniu946.com/", //请求地址配置 
 		// baseURL:'http://lnpt.frp.liuniu946.com/',//请求地址配置 
 		urlFile: '/index', //项目部署所在文件夹
 		userInfo: {}, //登录信息