4-13

.hbuilderx/launch.json

@@ -2,6 +2,10 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "remote"
+     	},
      	"default" : 
      	{
      		"launchtype" : "remote"
@@ -10,6 +14,10 @@
      	{
      		"launchtype" : "remote"
      	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "remote"
+     	},
      	"type" : "uniCloud"
      }
     ]

api/index.js

@@ -96,3 +96,12 @@ export function hanging_sale(data) {
 		data
 	});
 }
+
+//http://sxg.frp.liuniu946.com/api/auction/see_order?id=11
+export function see_order(data) {
+	return request({
+		url: '/api/auction/see_order',
+		method: 'get',
+		data
+	});
+}

api/user.js

@@ -108,4 +108,13 @@ export function coral(data) {
 		method: 'post',
 		data
 	});
+}
+
+// transfer_accounts
+export function transfer_accounts(data) {
+	return request({
+		url: '/api/dow_user',
+		method: 'post',
+		data
+	});
 }

manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "基础项目",
-    "appid" : "__UNI__F0EBD91",
+    "name" : "随心购",
+    "appid" : "__UNI__474F381",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -21,18 +21,10 @@
             "android" : {
                 /* android打包配置 */
                 "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>"
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
@@ -48,6 +40,53 @@
                         "appsecret" : "",
                         "UniversalLinks" : ""
                     }
+                },
+                "geolocation" : {},
+                "payment" : {},
+                "push" : {},
+                "share" : {},
+                "speech" : {},
+                "statics" : {},
+                "ad" : {}
+            },
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "C:/Users/admin/Desktop/随心购/随心购/480.png",
+                    "xhdpi" : "C:/Users/admin/Desktop/随心购/随心购/720.png",
+                    "xxhdpi" : "C:/Users/admin/Desktop/随心购/随心购/1080.png"
+                }
+            },
+            "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"
+                    }
                 }
             }
         }

pages.json

@@ -1,33 +1,24 @@
-{
-	"easycom": {
-		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	},
-	"pages": [{
-			"path": "pages/index/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				// #ifdef MP
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP
-				"app-plus": {
-					"titleNView": {
-						"type": "none"
-					}
-				},
-				// #endif
-				"navigationBarTitleText": "商城首页"
-			}
-		},
-		{
-			"path": "pages/index/yuyuechang",
+{
+	"easycom": {
+		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
+	},
+	"pages": [{
+			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "",
 				"app-plus": {
 					"titleNView": false
 				}
 			}
 		},
+		{
+			"path": "pages/index/yuyuechang",
+			"style": {
+				"navigationBarTitleText": ""
+				// "app-plus": {
+				// 	"titleNView": false
+				// }
+			}
+		},
 		{
 			"path": "pages/product/new",
 			"style": {
@@ -36,17 +27,17 @@
 					"titleNView": false
 				}
 			}
-		},
-		{
-			"path": "pages/index/sign",
-			"style": {
-				"navigationBarTitleText": "每日签到",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
+		},
+		{
+			"path": "pages/index/sign",
+			"style": {
+				"navigationBarTitleText": "每日签到",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
 		},
 		{
 			"path": "pages/product/seckill",
@@ -54,26 +45,26 @@
 				"navigationBarTitleText": "限时秒杀"
 			}
 		},
-		{
-			"path": "pages/public/register",
-			"style": {
-				"navigationBarTitleText": "注册",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		}, {
-			"path": "pages/public/login",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
+		{
+			"path": "pages/public/register",
+			"style": {
+				"navigationBarTitleText": "注册",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		}, {
+			"path": "pages/public/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
 		},
 		{
 			"path": "pages/collection/collection",
@@ -93,81 +84,81 @@
 				"navigationBarTitleText": "添加支付宝"
 			}
 		},
-		
+
 		{
 			"path": "pages/collection/wx",
 			"style": {
-			"navigationBarTitleText": "添加微信"
-			}
-		},
-		{
-			"path": "pages/public/wxLogin",
-			"style": {
-				"navigationBarTitleText": "微信登录",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/public/forget",
-			"style": {
-				"navigationBarTitleText": "忘记密码",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/product/reply",
-			"style": {
-				"navigationBarTitleText": "商品评价",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/product/product",
-			"style": {
-				"navigationBarTitleText": "详情展示",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/hall/porducthall",
-			"style": {
-				"navigationBarTitleText": "详情展示",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/product/list",
-			"style": {
-				"navigationBarTitleText": "商品列表"
-			}
+				"navigationBarTitleText": "添加微信"
+			}
+		},
+		{
+			"path": "pages/public/wxLogin",
+			"style": {
+				"navigationBarTitleText": "微信登录",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/public/forget",
+			"style": {
+				"navigationBarTitleText": "忘记密码",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/product/reply",
+			"style": {
+				"navigationBarTitleText": "商品评价",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/product/product",
+			"style": {
+				"navigationBarTitleText": "详情展示",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/hall/porducthall",
+			"style": {
+				"navigationBarTitleText": "详情展示",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/product/list",
+			"style": {
+				"navigationBarTitleText": "商品列表"
+			}
 		},
 		{
 			"path": "pages/product/zero",
 			"style": {
 				"navigationBarTitleText": "0元购",
-				"navigationBarBackgroundColor":"#DC262B",
-				"navigationBarTextStyle":"white"
-				
+				"navigationBarBackgroundColor": "#DC262B",
+				"navigationBarTextStyle": "white"
+
 			}
 		},
 		{
@@ -181,78 +172,78 @@
 			"style": {
 				"navigationBarTitleText": "门店信息"
 			}
-		},
-		{
-			"path": "pages/index/message",
-			"style": {
-				"navigationBarTitleText": "官方公告"
-			}
-		},
-		{
-			"path": "pages/index/messageInfo",
-			"style": {
-				"navigationBarTitleText": "公告详情"
-			}
-		},
-		{
-			"path": "pages/product/search",
-			"style": {
-				"enablePullDownRefresh": true,
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP || APP-PLUS
-				"app-plus": {
-					"titleNView": {
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "请输入关键字",
-							"disabled": false,
-							"placeholderColor": "#606266",
-							"align": "left"
-						},
-						"buttons": [{
-							"text": "搜索",
-							"fontSize": "14",
-							"color": "#303133",
-							"background": "rgba(0,0,0,0)",
-							"width": "40px"
-						}]
-					}
-				},
-				// #endif
-				"navigationBarTitleText": "搜索"
-			}
-		},
-		{
-			"path": "pages/product/classify",
-			"style": {
-				"navigationStyle": "custom",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/set/set",
-			"style": {
-				"navigationBarTitleText": "设置"
-			}
-		},
-		{
-			"path": "pages/set/address",
-			"style": {
-				"navigationBarTitleText": "收货地址"
-			}
-		},
-		{
-			"path": "pages/set/addressManage",
-			"style": {
-				"navigationBarTitleText": ""
-			}
+		},
+		{
+			"path": "pages/index/message",
+			"style": {
+				"navigationBarTitleText": "官方公告"
+			}
+		},
+		{
+			"path": "pages/index/messageInfo",
+			"style": {
+				"navigationBarTitleText": "公告详情"
+			}
+		},
+		{
+			"path": "pages/product/search",
+			"style": {
+				"enablePullDownRefresh": true,
+				// #ifdef APP-PLUS
+				"navigationStyle": "custom",
+				// #endif
+				// #ifndef MP || APP-PLUS
+				"app-plus": {
+					"titleNView": {
+						"searchInput": {
+							"backgroundColor": "rgba(231, 231, 231,.7)",
+							"borderRadius": "16px",
+							"placeholder": "请输入关键字",
+							"disabled": false,
+							"placeholderColor": "#606266",
+							"align": "left"
+						},
+						"buttons": [{
+							"text": "搜索",
+							"fontSize": "14",
+							"color": "#303133",
+							"background": "rgba(0,0,0,0)",
+							"width": "40px"
+						}]
+					}
+				},
+				// #endif
+				"navigationBarTitleText": "搜索"
+			}
+		},
+		{
+			"path": "pages/product/classify",
+			"style": {
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/set/set",
+			"style": {
+				"navigationBarTitleText": "设置"
+			}
+		},
+		{
+			"path": "pages/set/address",
+			"style": {
+				"navigationBarTitleText": "收货地址"
+			}
+		},
+		{
+			"path": "pages/set/addressManage",
+			"style": {
+				"navigationBarTitleText": ""
+			}
 		},
 		{
 			"path": "pages/set/cropper",
@@ -264,39 +255,39 @@
 					}
 				}
 			}
-		},
-		{
-			"path": "pages/set/phone",
-			"style": {
-				"navigationBarTitleText": "实名认证"
-			}
-		},
-		{
-			"path": "pages/set/password",
-			"style": {
-				"navigationBarTitleText": "修改密码"
-			}
-		},
-		{
-			"path": "pages/set/userinfo",
-			"style": {
-				"navigationBarTitleText": "修改资料"
-			}
-		}, {
-			"path": "pages/cart/cart",
-			"style": {
-				"navigationBarTitleText": "购物车"
-			}
-		},
-		
-		{
-			"path": "pages/user/user",
-			"style": {
+		},
+		{
+			"path": "pages/set/phone",
+			"style": {
+				"navigationBarTitleText": "实名认证"
+			}
+		},
+		{
+			"path": "pages/set/password",
+			"style": {
+				"navigationBarTitleText": "修改密码"
+			}
+		},
+		{
+			"path": "pages/set/userinfo",
+			"style": {
+				"navigationBarTitleText": "修改资料"
+			}
+		}, {
+			"path": "pages/cart/cart",
+			"style": {
+				"navigationBarTitleText": "购物车"
+			}
+		},
+
+		{
+			"path": "pages/user/user",
+			"style": {
 				"navigationBarTitleText": "个人中心",
 				"app-plus": {
 					"titleNView": false
-				}
-			}
+				}
+			}
 		},
 		{
 			"path": "pages/user/mygwjf",
@@ -337,57 +328,55 @@
 		{
 			"path": "pages/user/xfjfzz",
 			"style": {
-				"navigationBarTitleText": "消费积分转账",
+				"navigationBarTitleText": "消费积分转账"
+
+			}
+		},
+		{
+			"path": "pages/user/award",
+			"style": {
+				"navigationBarTitleText": "奖励明细",
 				"app-plus": {
-					"titleNView": false
+					"titleNView": {
+						"type": "transparent"
+					}
 				}
 			}
-		},
-		{
-			"path": "pages/user/award",
-			"style": {
-				"navigationBarTitleText": "奖励明细",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
 		},
 		{
 			"path": "pages/user/gzsq",
 			"style": {
 				"navigationBarTitleText": "馆长申请"
 			}
-		},
-		{
-			"path": "pages/user/withdrawal",
-			"style": {
-				"navigationBarTitleText": "奖励提现"
-			}
-		},
-		{
-			"path": "pages/user/notice",
-			"style": {
-				"navigationBarTitleText": "通知"
-			}
-		},
-		{
-			"path": "pages/user/favorites",
-			"style": {
-				"navigationBarTitleText": "我的收藏"
-			}
-		}, {
-			"path": "pages/user/coupon",
-			"style": {
-				"navigationBarTitleText": "我的卡卷"
-			}
-		},
-		{
-			"path": "pages/user/scoreAccumulate",
-			"style": {
-				"navigationBarTitleText": "积分明细"
-			}
+		},
+		{
+			"path": "pages/user/withdrawal",
+			"style": {
+				"navigationBarTitleText": "奖励提现"
+			}
+		},
+		{
+			"path": "pages/user/notice",
+			"style": {
+				"navigationBarTitleText": "通知"
+			}
+		},
+		{
+			"path": "pages/user/favorites",
+			"style": {
+				"navigationBarTitleText": "我的收藏"
+			}
+		}, {
+			"path": "pages/user/coupon",
+			"style": {
+				"navigationBarTitleText": "我的卡卷"
+			}
+		},
+		{
+			"path": "pages/user/scoreAccumulate",
+			"style": {
+				"navigationBarTitleText": "积分明细"
+			}
 		},
 		{
 			"path": "pages/user/scoreAccumulate",
@@ -395,7 +384,7 @@
 				"navigationBarTitleText": "积分明细"
 			}
 		},
-		
+
 		{
 			"path": "pages/user/xrtd",
 			"style": {
@@ -406,8 +395,8 @@
 			"path": "pages/user/approve",
 			"style": {
 				"navigationBarTitleText": "实名认证",
-				"navigationBarBackgroundColor":"#ff0000",
-				"navigationBarTextStyle":"white"
+				"navigationBarBackgroundColor": "#ff0000",
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -415,262 +404,255 @@
 			"style": {
 				"navigationBarTitleText": "申请记录"
 			}
-		},
-		{
-			"path": "pages/order/order",
-			"style": {
-			"navigationStyle":"custom",
-				"navigationBarTitleText": "",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		},
-		{
-			"path": "pages/order/order1",
-			"style": {
-				"navigationBarTitleText": "我的订单",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		},
-		{
-			"path": "pages/order/expressInfo",
-			"style": {
-				"navigationBarTitleText": "快递详情"
-			}
-		},
-		{
-			"path": "pages/order/orderDetail",
-			"style": {
-				"navigationBarTitleText": "订单详情",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		},
-		{
-			"path": "pages/hall/hallpay",
-			"style": {
-				"navigationBarTitleText": "支付"
-			}
-		},
-		{
-			"path": "pages/order/evaluate",
-			"style": {
-				"navigationBarTitleText": "评论"
-			}
-		},
-		{
-			"path": "pages/order/orderRefund",
-			"style": {
-				"navigationBarTitleText": "申请退款"
-			}
-		},
-		{
-			"path": "pages/order/createOrder",
-			"style": {
-				"navigationBarTitleText": "创建订单"
-			}
-		},  {
-			"path": "pages/money/pay",
-			"style": {
-				"navigationBarTitleText": "支付"
-			}
-		},
-		{
-			"path": "pages/money/paySuccess",
-			"style": {
-				"navigationBarTitleText": "支付成功"
-			}
-		},
-		{
-			"path": "pages/money/wallet",
-			"style": {
-				"navigationBarTitleText": "我的钱包",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/money/account",
-			"style": {
-				"navigationBarTitleText": "提现账号"
-			}
-		},
-		{
-			"path": "pages/money/recharge",
-			"style": {
-				"navigationBarTitleText": "充值"
-			}
+		},
+		{
+			"path": "pages/order/order",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/order/order1",
+			"style": {
+				"navigationBarTitleText": "我的订单",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/order/expressInfo",
+			"style": {
+				"navigationBarTitleText": "快递详情"
+			}
+		},
+		{
+			"path": "pages/order/orderDetail",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/hall/hallpay",
+			"style": {
+				"navigationBarTitleText": "支付"
+			}
+		},
+		{
+			"path": "pages/order/evaluate",
+			"style": {
+				"navigationBarTitleText": "评论"
+			}
+		},
+		{
+			"path": "pages/order/orderRefund",
+			"style": {
+				"navigationBarTitleText": "申请退款"
+			}
+		},
+		{
+			"path": "pages/order/createOrder",
+			"style": {
+				"navigationBarTitleText": "创建订单"
+			}
+		}, {
+			"path": "pages/money/pay",
+			"style": {
+				"navigationBarTitleText": "支付"
+			}
+		},
+		{
+			"path": "pages/money/paySuccess",
+			"style": {
+				"navigationBarTitleText": "支付成功"
+			}
+		},
+		{
+			"path": "pages/money/wallet",
+			"style": {
+				"navigationBarTitleText": "我的钱包",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/money/account",
+			"style": {
+				"navigationBarTitleText": "提现账号"
+			}
+		},
+		{
+			"path": "pages/money/recharge",
+			"style": {
+				"navigationBarTitleText": "充值"
+			}
 		},
 		{
 			"path": "pages/money/withdmoenys",
 			"style": {
 				"navigationBarTitleText": "兑换"
 			}
-		},
-		{
-			"path": "pages/category/category",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP
-				"app-plus": {
-					"bounce": "none",
-					"titleNView": {
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "商品搜索",
-							"disabled": true,
-							"placeholderColor": "#606266",
-							"align": "left"
-						}
-					}
-				},
-				// #endif
-				"navigationBarTitleText": "分类"
-			}
-		},
-		{
-			"path": "pages/redirect/redirect",
-			"style": {
-				"navigationBarTitleText": "微信登录跳转页面",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
+		},
+		{
+			"path": "pages/category/category",
+			"style": {
+				// #ifdef APP-PLUS
+				"navigationStyle": "custom",
+				// #endif
+				// #ifndef MP
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": {
+						"searchInput": {
+							"backgroundColor": "rgba(231, 231, 231,.7)",
+							"borderRadius": "16px",
+							"placeholder": "商品搜索",
+							"disabled": true,
+							"placeholderColor": "#606266",
+							"align": "left"
+						}
+					}
+				},
+				// #endif
+				"navigationBarTitleText": "分类"
+			}
+		},
+		{
+			"path": "pages/redirect/redirect",
+			"style": {
+				"navigationBarTitleText": "微信登录跳转页面",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
 		},
 		{
 			"path": "pages/category/mall",
 			"style": {
-				"navigationBarTitleText": "商城",
 				"app-plus": {
 					"titleNView": false
 				}
 			}
-		},
-		{
-			"path": "pages/hall/hall",
-			"style": {
-				"navigationBarTitleText": "趣豆会馆",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/hall/halllist",
-			"style": {
-				"navigationBarTitleText": "会馆详情",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/hall/hallinfo",
-			"style": {
-				"navigationBarTitleText": "场次详情",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/hall/history",
-			"style": {
-				"navigationBarTitleText": "场次详情"
-			}
-		},
-		{
-			"path": "pages/money/money",
-			"style": {
-				"navigationBarTitleText": "财务",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/user/shareQrCode",
-			"style": {
-				"navigationBarTitleText": "邀请好友"
-			}
-		}
-	    ,{
-            "path" : "pages/money/qudou",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的趣豆",
-                "enablePullDownRefresh": false,
-				"app-plus":{
-					"titleNView":false
+		},
+		{
+			"path": "pages/hall/hall",
+			"style": {
+				"navigationBarTitleText": "趣豆会馆",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/hall/halllist",
+			"style": {
+				"navigationBarTitleText": "会馆详情",
+				"app-plus": {
+					"titleNView": false
 				}
-            }
-            
-        }
-        ,{
-            "path" : "pages/money/jifen",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/money/zhihuanquan",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
-	
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#f8f8f8"
-	},
-	"tabBar": {
-		"color": "#C0C4CC",
-		"selectedColor": "#f42b4e",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tabBar/tab-home.png",
-				"selectedIconPath": "static/tabBar/tab-home-current.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/category/mall",
-				"iconPath": "static/tabBar/tab-cate.png",
-				"selectedIconPath": "static/tabBar/tab-cate-current.png",
-				"text": "商城"
+			}
+		},
+		{
+			"path": "pages/hall/hallinfo",
+			"style": {
+				"navigationBarTitleText": "场次详情",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/hall/history",
+			"style": {
+				"navigationBarTitleText": "场次详情"
+			}
+		},
+		{
+			"path": "pages/money/money",
+			"style": {
+				"navigationBarTitleText": "财务",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/user/shareQrCode",
+			"style": {
+				"navigationBarTitleText": "邀请好友"
+			}
+		}, {
+			"path": "pages/money/qudou",
+			"style": {
+				"navigationBarTitleText": "我的趣豆",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+
+		}, {
+			"path": "pages/money/jifen",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/money/zhihuanquan",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
+
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#f8f8f8"
+	},
+	"tabBar": {
+		"color": "#C0C4CC",
+		"selectedColor": "#f42b4e",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/tabBar/tab-home.png",
+				"selectedIconPath": "static/tabBar/tab-home-current.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/category/mall",
+				"iconPath": "static/tabBar/tab-cate.png",
+				"selectedIconPath": "static/tabBar/tab-cate-current.png",
+				"text": "商城"
 			},
 			{
 				"pagePath": "pages/order/order",
 				"iconPath": "static/tabBar/tab-cart.png",
 				"selectedIconPath": "static/tabBar/tab-cart-current.png",
 				"text": "订单"
-			},
-			{
-				"pagePath": "pages/user/user",
-				"iconPath": "static/tabBar/tab-my.png",
-				"selectedIconPath": "static/tabBar/tab-my-current.png",
-				"text": "我的"
-			}
-		]
-	}
+			},
+			{
+				"pagePath": "pages/user/user",
+				"iconPath": "static/tabBar/tab-my.png",
+				"selectedIconPath": "static/tabBar/tab-my-current.png",
+				"text": "我的"
+			}
+		]
+	}
 }

pages/category/mall.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="center">
 		<!-- 顶部logo and 搜索 start-->
+		<!-- 这里是状态栏 -->
+		<view class="status_bar"></view>
 		<view class="top-search flex">
 			<view class="top-logo">
 				<image src="../../static/icon/logo.png" mode="widthFix"></image>
@@ -370,5 +372,10 @@
 		}
 		
 	}
+	.status_bar {
+	        height: var(--status-bar-height);
+	        width: 100%;
+	        background: #fff;
+	}
 </style>
 

pages/index/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="center">
 		<!-- 顶部logo and 搜索 start-->
+		<view class="status_bar"></view>
 		<view class="top-search flex">
 			<view class="top-logo">
 				<image src="../../static/icon/logo.png" mode="widthFix"></image>
@@ -39,7 +40,7 @@
 			<view class="yuyue-top flex">
 				<image src="../../static/img/yuyue-top.png" mode="heightFix"></image>
 			</view>
-			<view class="yuyue-item"  v-for="item in changCiList">
+			<view class="yuyue-item" v-for="item in changCiList">
 				<view class="item-top">
 					<image src="../../static/img/yuyue.png" mode=""></image>
 					<view class="item-top-info flex">
@@ -57,32 +58,32 @@
 					</view>
 					<view class="item-val flex">
 						<view class="item-status">
-							距离本场开始
+							{{!item.djs.over ? '距离预约结束': (!item.jcdjs.over?'距离开始进场':(!item.jsdjs.over?'活动进行中': '活动已结束'))}}
 						</view>
 						<view class="item-djs">
-							
-							<uni-countdown
-							v-if="!item.djs.over"
-								color="#C6914E"
-								background-color="#F6EFDF"
-								:show-day="false"
-								:day="item.djs.day"
-								:hour="item.djs.hours"
-								:minute="item.djs.minutes"
-								:second="item.djs.seconds"
-							></uni-countdown>
-							<view class="" v-else style="color: #dc262b;">
-								预约已结束
+
+							<uni-countdown v-if="!item.djs.over" color="#C6914E" background-color="#F6EFDF"
+								:show-day="false" :day="item.djs.day" :hour="item.djs.hours" :minute="item.djs.minutes"
+								:second="item.djs.seconds"></uni-countdown>
+							<uni-countdown v-if="item.djs.over && !item.jcdjs.over" color="#C6914E" background-color="#F6EFDF"
+								:show-day="false" :day="item.jcdjs.day" :hour="item.jcdjs.hours" :minute="item.jcdjs.minutes"
+								:second="item.jcdjs.seconds"></uni-countdown>
+							<uni-countdown v-if="item.jcdjs.over && !item.jsdjs.over" color="#C6914E" background-color="#F6EFDF"
+								:show-day="false" :day="item.jsdjs.day" :hour="item.jsdjs.hours" :minute="item.jsdjs.minutes"
+								:second="item.jsdjs.seconds"></uni-countdown>
+							<view class="" v-if="item.jsdjs.over" style="color: #dc262b;">
+								活动已结束
 							</view>
 						</view>
 						<view class="item-base">
 							开始时间 {{item.radd_time}} 结束时间 {{item.rend_time }}
 						</view>
-						<view class="item-btn" @click="yuyue(item)" :class="{'yuyue': !item.djs.over || item.sta == 2 }">
+						<view class="item-btn" @click="yuyue(item)"
+							:class="{'yuyue': !item.djs.over && item.sta == 1,'jcf':item.jcdjs.over && item.sta == 2 && !item.jsdjs.over }">
 							{{item.sta == 2 ? '立即进场': (item.djs.over ? '已结束': '立即预约')}}
 						</view>
 					</view>
-					
+
 				</view>
 			</view>
 		</view>
@@ -125,12 +126,14 @@
 					确定
 				</view>
 			</view>
-		</uni-popup >
+		</uni-popup>
 	</view>
 </template>
 
 <script>
-	import { timeComputed } from '@/utils/rocessor.js'
+	import {
+		timeComputed
+	} from '@/utils/rocessor.js'
 	import {
 		tabbar1
 	} from '@/utils/tabbar.js';
@@ -141,7 +144,10 @@
 		advance
 	} from '@/api/index.js';
 	import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
-	import { mapState, mapMutations } from 'vuex';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
 	export default {
 		components: {
 			uniCountdown
@@ -168,13 +174,13 @@
 		},
 		onLoad() {
 			this.loadData();
-			
+
 		},
 		onShow() {
 			this.getChangCi()
 		},
 		computed: {
-			...mapState('user',['userInfo'])
+			...mapState('user', ['userInfo'])
 		},
 		methods: {
 			loadData() {
@@ -227,7 +233,7 @@
 			// 打开预约弹窗
 			yuyue(item) {
 
-				if(item.sta == 2) {
+				if (item.sta == 2) {
 					// 进场
 					advance({
 						id: item.id
@@ -237,46 +243,51 @@
 							url: '/pages/index/yuyuechang?id=' + item.id
 						})
 					})
-				}else {
-					if(item.djs.over) {
+				} else {
+					if (item.djs.over) {
 						return
 					}
 					this.yuyueInfo = item
 					this.$refs.popupyy.open()
 				}
-				
+
 			},
 			// 确定预约
 			yuyueOk() {
 				let obj = this
 				// 判断广告值
-				if(obj.yuyueInfo.minimum*1 > obj.userInfo.aid_val*1) {
+				if (obj.yuyueInfo.minimum * 1 > obj.userInfo.aid_val * 1) {
 					return obj.$api.msg('您当前广告值不足')
 				}
 				// 判断消费账户
-				if(obj.yuyueInfo.lowest*1 > obj.userInfo.now_money*1) {
+				if (obj.yuyueInfo.lowest * 1 > obj.userInfo.now_money * 1) {
 					return obj.$api.msg('您当前消费账户不足')
 				}
 				subscribe({
 					id: obj.yuyueInfo.id
 				}).then(res => {
-					console.log(res,'确定预约')
+					console.log(res, '确定预约')
+					// yuyueInfo
+					let s = obj.changCiList.indexOf(obj.yuyueInfo);
+					obj.changCiList[s].sta = 2;
 					obj.$refs.popupyy.close()
 					obj.$refs.popupyyok.open()
 				})
-				
+
 			},
 			// 获取场次信息
 			getChangCi() {
 				let obj = this
 				getChangCi({
 					page: 1,
-					limit: 10
+					limit: 100
 				}).then(res => {
-					console.log(res,'获取场次信息')
-					
+					console.log(res, '获取场次信息')
+
 					let arr = res.data.map(e => {
 						e.djs = timeComputed(e.time)
+						e.jcdjs = timeComputed(e.time + 1800)
+						e.jsdjs = timeComputed(e.e_time)
 						return e
 					})
 					console.log(arr)
@@ -294,11 +305,13 @@
 		height: auto;
 		background: #ededed;
 	}
+
 	// 顶部搜索
 	.top-search {
 		height: 80rpx;
 		padding: 0 20rpx;
 		background-color: #fff;
+
 		.top-logo {
 			width: 50rpx;
 			// height: 50rpx;
@@ -332,16 +345,19 @@
 			}
 		}
 	}
+
 	// 顶部轮播图
 	.top-swiper {
 		width: 750rpx;
 		height: 360rpx;
+
 		// margin: 20rpx 0 0;
 		image {
 			width: 750rpx;
 			height: 360rpx;
 		}
 	}
+
 	.swiper-btm {
 		height: 60rpx;
 		width: 750rpx;
@@ -350,9 +366,11 @@
 		font-size: 21rpx;
 		font-weight: 500;
 		color: #333333;
+
 		.btm-item {
 			flex-grow: 1;
 			justify-content: center;
+
 			image {
 				width: 25rpx;
 				height: 25rpx;
@@ -360,36 +378,43 @@
 			}
 		}
 	}
+
 	.jg {
 		height: 20rpx;
 		background-color: #fff;
 	}
+
 	.yuyue-wrap {
 		background-color: #fff;
+
 		.yuyue-top {
 			height: 117rpx;
 			justify-content: center;
+
 			image {
 				display: inline-block;
 				height: 31rpx;
 				margin: auto;
 			}
 		}
+
 		.yuyue-item {
 			width: 690rpx;
 			margin: auto;
-			
+
 			.item-top {
 				width: 690rpx;
 				height: 80rpx;
 				border-radius: 18rpx;
 				// background-color: #bfa;
 				position: relative;
+
 				image {
 					width: 690rpx;
 					height: 80rpx;
 					// position: relative;
 				}
+
 				.item-top-info {
 					width: 690rpx;
 					height: 80rpx;
@@ -401,11 +426,13 @@
 					color: #C6914E;
 					padding-left: 35rpx;
 					padding-right: 25rpx;
+
 					text {
 						font-size: 22rpx;
 						font-weight: 500;
 						color: #C6914E;
 					}
+
 					.goto {
 						width: 60rpx;
 						line-height: 26rpx;
@@ -418,6 +445,7 @@
 					}
 				}
 			}
+
 			.item-info {
 				width: 690rpx;
 				height: 252rpx;
@@ -427,16 +455,19 @@
 				border-radius: 0px 0px 20rpx 20rpx;
 				padding: 0 25rpx;
 				margin-bottom: 20rpx;
+
 				.item-img {
 					width: 134rpx;
 					height: 133rpx;
 					background-color: red;
 					flex-shrink: 0;
+
 					image {
 						width: 134rpx;
 						height: 133rpx;
 					}
 				}
+
 				.item-val {
 					flex-grow: 1;
 					height: 100%;
@@ -446,20 +477,24 @@
 					align-items: flex-start;
 					padding-left: 25rpx;
 					justify-content: center;
+
 					.item-djs {
 						margin: 20rpx 0;
 						height: 42rpx;
 					}
+
 					.item-status {
 						font-size: 26rpx;
 						font-weight: bold;
 						color: #333333;
 					}
+
 					.item-base {
 						font-size: 25rpx;
 						font-weight: 500;
 						color: #666666;
 					}
+
 					.item-btn {
 						width: 159rpx;
 						height: 59rpx;
@@ -473,15 +508,21 @@
 						margin: auto;
 						text-align: center;
 					}
+
 					.yuyue {
 						background-color: #303030;
 						color: #F8DABA;
 					}
+					.jcf {
+						background-color: #f42b4e;
+						color: #fff;
+					}
 				}
-				
+
 			}
 		}
 	}
+
 	.popupyy-wrap {
 		width: 750rpx;
 		height: 745rpx;
@@ -492,11 +533,13 @@
 		color: #999999;
 		font-weight: 500;
 		padding-top: 60rpx;
+
 		.popupyy-top {
 			font-size: 36rpx;
 			font-weight: 500;
 			color: #333333;
 			position: relative;
+
 			&::before {
 				content: '';
 				width: 138rpx;
@@ -508,6 +551,7 @@
 				left: 124rpx;
 				margin: auto;
 			}
+
 			&::after {
 				content: '';
 				width: 138rpx;
@@ -520,18 +564,21 @@
 				margin: auto;
 			}
 		}
+
 		.popupyy-tit {
 			font-size: 32rpx;
 			font-weight: 500;
 			color: #999999;
 			margin-top: 70rpx;
 		}
+
 		.popupyy-val {
 			font-size: 67rpx;
 			font-weight: bold;
 			color: #333333;
 			margin-top: 60rpx;
 		}
+
 		.popupyy-btn {
 			width: 680rpx;
 			line-height: 100rpx;
@@ -543,15 +590,18 @@
 			margin: 20rpx auto 0;
 		}
 	}
+
 	.popupyyok-wrap {
 		height: 707rpx;
 		width: 551rpx;
 		background-color: #fff;
 		border-radius: 20rpx;
 		text-align: center;
+
 		image {
 			width: 100%;
 		}
+
 		.btn {
 			width: 295rpx;
 			line-height: 69rpx;
@@ -563,4 +613,10 @@
 			margin: auto;
 		}
 	}
+
+	.status_bar {
+		height: var(--status-bar-height);
+		width: 100%;
+		background: #fff;
+	}
 </style>

pages/index/yuyuechang.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="content">
+		<view class="top-bg">
+			<image src="../../static/img/yuyue-top.jpg" mode="widthFix"></image>
+		</view>
 		<!-- <view class="changci-top flex">
 			<view class="djs-wrap flex">
 				倒计时： 
@@ -31,7 +34,7 @@
 					实付金额：{{item.low}} ~ {{ item.high }}
 				</view>
 			</view>
-			<view class="good-list flex" @click="goumai(item)">
+			<view class="good-list flex" @click="status==2?goumai(item):''">
 				<image src="../../static/icon/red-gift.png" mode="widthFix" v-for="itemg in 35"></image>
 			</view>
 		</view>
@@ -53,7 +56,7 @@
 </template>
 
 <script>
-	import { section, purchase } from '@/api/index.js'
+	import { section, purchase,zfpay,see_order } from '@/api/index.js'
 	import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
 	import { mapState, mapMutations } from 'vuex';
 	export default {
@@ -64,7 +67,8 @@
 			return {
 				ccid: '',
 				area: [],
-				good: {}
+				good: {},
+				status: 2,//1购买了商品2未购买商品
 			}
 		},
 		computed: {
@@ -72,9 +76,22 @@
 		},
 		onLoad(opt) {
 			this.ccid = opt.id
+			this.see_order()
 			this.section()
 		},
 		methods: {
+			see_order() {
+				let obj = this
+				see_order({
+					id: obj.ccid
+				}).then(res => {
+					console.log(res.data.status)
+					obj.status = res.data.status
+					if(res.data.status == 1) {
+						obj.good = res.data.order
+					}
+				})
+			},
 			section() {
 				let obj = this
 				section({
@@ -96,8 +113,12 @@
 				})
 			},
 			zhifu() {
-				uni.navigateTo({
-					url: ''
+				let obj = this
+				zfpay({
+					order_id: obj.good.order_id
+				}).then(res => {
+					obj.$api.msg('支付成功')
+					obj.$refs.popupyyok.close()
 				})
 			}
 		}
@@ -147,11 +168,17 @@
 		background-color: #fff;
 		border-radius: 20rpx;
 		text-align: center;
+		// position: relative;
 		image {
 			width: 100%;
 			height: 429rpx;
 		}
 		.btn {
+			position: absolute;
+			bottom: 10rpx;
+			left: 0;
+			right: 0;
+			margin: auto;
 			width: 295rpx;
 			line-height: 69rpx;
 			border-radius: 34rpx;
@@ -159,7 +186,13 @@
 			color: #F8DABA;
 			font-size: 35rpx;
 			color: #F8DABA;
-			margin: auto;
+		}
+	}
+	.top-bg {
+		width: 750rpx;
+		margin-bottom: 20rpx;
+		image {
+			width: 100%;
 		}
 	}
 </style>

pages/money/pay.vue

@@ -14,11 +14,11 @@
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 1"></radio></label>
 			</view> -->
 			<!-- #ifdef APP-PLUS -->
-			<view class="type-item b-b" @click="changePayType(2)">
+			<!-- <view class="type-item b-b" @click="changePayType(2)">
 				<text class="icon iconfont iconzhifubao"></text>
 				<view class="con"><text class="tit">支付宝支付</text></view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 2"></radio></label>
-			</view>
+			</view> -->
 			<!-- #endif -->
 			<view class="type-item" @click="changePayType(3)">
 				<text class="icon iconfont iconyue"></text>
@@ -46,7 +46,8 @@ export default {
 			// #endif
 			// #ifdef MP-WEIXIN
 			payName: 'yue',
-			// #endif
+			// #endif
+			payName: 'yue',
 			orderInfo: {},
 			money: 0.0, //订单金额
 			now_money: 0.0, //余额
@@ -77,7 +78,7 @@ export default {
 				orderkey: this.orderKey,
 				couponId: prepage.couponChecked.id, //优惠券编号
 				addressId: prepage.addressData.id, //地址编号
-				useIntegral: prepage.checkedPoints ? 1 : 0
+				top_ticket: prepage.checkedPoints ? 1 : 0,
 			}).then(({ data }) => {
 				// 获取支付金额
 				this.money = data.result.pay_price;
@@ -227,8 +228,8 @@ export default {
 				phone: prepage.addressData.phone, //联系人号码
 				couponId: prepage.couponChecked.id, //优惠券编号
 				addressId: prepage.addressData.id, //支付地址id
-				useIntegral: prepage.checkedPoints ? 1 : 0, //是否积分抵扣1为是0为否
-				payType: obj.payName, //支付类型  weixin-微信 yue-余额
+				top_ticket: prepage.checkedPoints ? 1 : 0, //是否积分抵扣1为是0为否
+				payType: 'yue', //支付类型  weixin-微信 yue-余额
 				mark: prepage.desc, //备注
 				// #ifdef H5
 				from: obj.froms ? 'weixin' : 'H5', //来源
@@ -244,10 +245,12 @@ export default {
 			// 判断是否拼团商品
 			if (obj.pinkid) {
 				data.pinkId = obj.pinkid;
-			}
+			}
+			console.log(data,'llllll')
 			// 生成订单
 			createOrderkey(data, obj.orderKey)
-				.then(({ data, status, msg }) => {
+				.then(({ data, status, msg }) => {
+					console.log(data,'222222222222222')
 					// 判断是否支付失败
 					if (data.status == 'ORDER_EXIST') {
 						uni.showModal({
@@ -262,7 +265,8 @@ export default {
 					// 保存订单号
 					obj.orderId = data.result.orderId;
 					// 判断是否为余额支付
-					if (obj.payName == 'yue') {
+					if (obj.payName == 'yue') {
+						console.log('33333')
 						if (status == 200 && data.status == 'SUCCESS') {
 							obj.paySuccessTo();
 						} else {

pages/order/createOrder.vue

@@ -95,7 +95,7 @@
 			</view> -->
 			<view class="yt-list-cell b-b">
 				<text class="cell-tit clamp">提货券抵扣{{ '（当前提货券：' + integralAll + '）' }}</text>
-				<view class="cell-tip"><radio @click="checkedPoints = !checkedPoints" color=" #dc262b" :checked="checkedPoints" /></view>
+				<view class="cell-tip"><radio color=" #dc262b" :checked="checkedPoints" /></view>
 			</view>
 			<view class="yt-list-cell b-b">
 				<text class="cell-tit clamp">运费</text>
@@ -207,7 +207,7 @@ export default {
 			},
 			payPrice: 0, //总支付金额
 			orderKey: '', //订单id
-			checkedPoints: false, //判断是否积分抵扣
+			checkedPoints: true, //判断是否积分抵扣
 			integralAll: 0, //可使用的积分
 			integralMoney: 0, //积分抵扣金额
 			integralShow: false, //是否显示积分抵扣金额
@@ -271,16 +271,17 @@ export default {
 		// 加载用户基础信息
 		getUserInfo() {
 			getUserInfo({}).then(({ data }) => {
-				this.integralAll = data.integral;
+				this.integralAll = data.top_ticket;
 			});
 		},
 		// 计算支付金额
 		payMoneyNub() {
 			computedOrderkey({
 				orderkey: this.orderKey,
-				useIntegral: this.checkedPoints ? 1 : 0, //是否积分抵扣
+				// useIntegral: this.checkedPoints ? 1 : 0, //是否积分抵扣
 				couponId: this.couponChecked.id, //优惠券编号
-				addressId: this.addressData.id //地址编号
+				addressId: this.addressData.id ,//地址编号
+				top_ticket:  this.checkedPoints ? 1 : 0,
 			})
 				.then(({ data }) => {
 					console.log(data,'111');

pages/order/order1.vue

@@ -51,7 +51,7 @@
 							件商品 邮费
 							<text class="price">{{ moneyNum(item.pay_postage)}}</text>
 							实付款
-							<text class="price" v-if="item.use_integral != 0">{{ moneyNum(item.pay_price)}}+{{item.use_integral}}趣豆</text>
+							<text class="price" v-if="item.use_integral != 0">{{ moneyNum(item.pay_price)}}</text>
 							<text class="price" v-if="item.use_integral == 0">{{ moneyNum(item.pay_price)}}</text>
 						</view>
 						<view class="action-box b-t" v-if="item.status != 5">
@@ -476,7 +476,7 @@ page,
 				font-size: $font-base + 2rpx;
 				color: $font-color-dark;
 				&:before {
-					content: '￥';
+					content: '';
 					font-size: $font-sm;
 					
 				}
@@ -498,7 +498,7 @@ page,
 			font-size: $font-lg;
 			color: $font-color-dark;
 			&:before {
-				content: '￥';
+				content: '';
 				font-size: $font-sm;
 				margin: 0 2rpx 0 8rpx;
 			}

pages/order/orderDetail.vue

@@ -53,27 +53,27 @@
 		</view>
 		<view class="row b-b flex">
 			<text class="tit">订单总价</text>
-			<view class="input">￥{{ payAllMoney }}</view>
+			<view class="input">{{ payAllMoney }}</view>
 		</view>
 		<view class="row b-b flex" v-if="vipMoney > 0">
 			<text class="tit">vip优惠</text>
-			<view class="input">-￥{{ vipMoney }}</view>
+			<view class="input">- {{vipMoney }}</view>
 		</view>
 		<view class="row b-b flex">
 			<text class="tit">邮费</text>
-			<view class="input">{{ item.pay_postage > 0 ? '￥' + item.pay_postage : '免邮费' }}</view>
+			<view class="input">{{ item.pay_postage > 0 ? item.pay_postage : '免邮费' }}</view>
 		</view>
 		<view class="row b-b flex" v-if="item.coupon_id > 0">
 			<text class="tit">优惠券</text>
-			<view class="input">-￥{{ item.coupon_price }}</view>
+			<view class="input">-{{ item.coupon_price }}</view>
 		</view>
 		<view class="row b-b flex" v-if="item.use_integral > 0">
-			<text class="tit">积分抵扣</text>
-			<view class="input">-￥{{ item.use_integral }}</view>
+			<text class="tit">提货券抵扣</text>
+			<view class="input">-{{ item.use_integral }}</view>
 		</view>
 		<view class="row b-b flex">
 			<text class="tit ">实付</text>
-			<view class="input payColor">￥{{ item.pay_price }}</view>
+			<view class="input payColor">{{ item.pay_price }}</view>
 		</view>
 
 		<view class="orderDetialBox">
@@ -385,7 +385,7 @@ page {
 	}
 	.tit {
 		flex-shrink: 0;
-		width: 120rpx;
+		width: 180rpx;
 		font-size: 30rpx;
 		color: $font-color-dark;
 	}
@@ -480,7 +480,7 @@ page {
 				font-size: $font-base + 2rpx;
 				color: $font-color-dark;
 				&:before {
-					content: '￥';
+					content: '';
 					font-size: $font-sm;
 					margin: 0 2rpx 0 8rpx;
 				}

pages/public/login.vue

@@ -1,387 +1,429 @@
-<template>
-	<view class="container">
-		<view class="container_text">
-			<image class="banner-img" src="/static/img/img01.png" mode="scaleToFill"></image>
-		</view>
-		<view class="loginTitle"><text>登录</text></view>
-		<view class="login_text">
-			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img03.png"></image></view>
-				<view class="login_name"><input class="uni-input" v-model="username" focus placeholder="请输入手机号" /></view>
-			</view>
-			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="passward" focus placeholder="请输入密码" /></view>
-			</view>
-			<view><button type="green" class="uni-button uni-button-green" @click="toLogin">登录</button></view>
-			<view><button type="green" class="uni-button uni-button-green uni-button-green-plain" plain="true" hover-class="none" @click="register">注册</button></view>
-			<navigator url="./forget"><view class="forget">忘记密码</view></navigator>
-			<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"><image src="/static/img/img05.png"></image></view>
-					<view class="weixin_text" @click="wecahtLogin">微信登录</view>
-					<!-- #endif -->
-					<!-- #ifdef APP-PLUS -->
-					<block v-if="!is_ios">
-						<view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png" mode="scaleToFill"></image></view>
-						<view class="weixin_text" @click="wecahtLogin">微信登录</view>
-					</block>
-					<block v-else>
-						<view class="ios_login flex" @click="wecahtLogin('weixin')">
-							<text class="iconfont iconweixin"></text>
-							<text class="weixin_text">微信登录</text>
-						</view>
-						<view v-if='is_apple_login' class="ios_login flex" @click="wecahtLogin('apple')">
-							<image class="loginIcon" src="/static/icon/appleIcon.png" mode=" scaleToFill"></image>
-							<text class="weixin_text">通过Apple登录</text>
-						</view>
-					</block>
-					<!-- #endif -->
-				</view>
-			</view>
-</template>
-
-<script>
-import { mapMutations } from 'vuex';
-import { login} from '@/api/login.js';
-import { getUserInfo} from '@/api/user.js';
-// #ifdef APP-PLUS
-// applelogin接口需要开发编写，基础项目中可能没有
-import { applelogin } from '@/api/set.js';
-// loginWx接口需要开发编写，基础项目中可能没有
-import { loginWx } from '@/api/login.js';
-// #endif
-// #ifdef H5
-import { loginWinxin } from '@/utils/wxAuthorized';
-// #endif
-export default {
-	data() {
-		return {
-			username: '',
-			passward: '',
-			// #ifdef APP-PLUS
-			is_ios: false ,//判断是否为ios手机
-			is_apple_login:false,//是否有ios授权登录功能
-			// #endif
-		};
-	},
-	onLoad() {
-		let obj = this;
-		// #ifdef APP-PLUS
-		let system = uni.getStorageSync('platform');
-		// 判断是否为ios
-		if (system == 'ios') {
-			obj.is_ios = true;
-		}
-		uni.getSystemInfo({
-			success(e) {
-				if(+e.system.split('.')[0]>=13){
-					obj.is_apple_login=true;
-				}
-			}
-		})
-		// #endif
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'login']),
-		// 微信登录
-		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) {
-					uni.getUserInfo({
-						provider: type,
-						success(es) {
-							if(type==='weixin'){
-								loginWx(es.userInfo)
-									.then(e => {
-										uni.setStorageSync('token', e.data.token);
-										getUserInfo({}).then(e => {
-											obj.login();
-											// 保存返回用户数据
-											obj.setUserInfo(e.data);
-											//成功跳转首页
-											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'
-											});
-										});
-										
-									})
-									.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
-					});
-				}
-			});
-			// #endif
-		},
-		//登录
-		async toLogin() {
-			let obj = this;
-			obj.logining = true;
-			if (obj.username == '') {
-				obj.$api.msg('请输入手机号');
-				return;
-			}
-			if (obj.passward == '') {
-				obj.$api.msg('请输入密码');
-				return;
-			}
-			login({
-				account: obj.username,
-				password: obj.passward
-			})
-				.then(function(e) {
-					console.log(e.data.token,"123456");
-					uni.setStorageSync('token', e.data.token);
-					// obj.$store.commit('hasLogin', true);
-					getUserInfo({}).then(e => {
-						obj.login();
-						// 保存返回用户数据
-						obj.setUserInfo(e.data);
-						let ur = uni.getStorageSync('present')|| '/pages/index/index';
-						//成功跳转首页
-						uni.switchTab({
-							url: ur,
-							fail(e) {
-								uni.navigateTo({
-									url: ur,
-									fail(e) {
-										uni.navigateTo({
-											url: '/pages/index/index',
-										});
-									}
-								});
-							}
-						});
-					});
-				})
-				.catch(function(e) {
-					console.log(e);
-				});
-		},
-		//跳转注册页
-		register() {
-			uni.navigateTo({
-				url: `/pages/public/register`
-			});
-		},
-		// 后退
-		navBack() {
-			uni.navigateBack();
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-	/* #ifdef APP-PLUS */
-	
-	.ios_login {
-		width: 260rpx;
-		border-radius: 12rpx;
-		justify-content: center;
-		border: 1px solid #212121;
-		margin: 24rpx auto;
-		padding: 10rpx;
-		background-color: #212121;
-		color: #ffffff;
-		.loginIcon {
-			width: 50rpx;
-			height: 50rpx;
-		}
-		.weixin_text {
-			line-height: 1;
-			margin-left: 20rpx;
-			color: #ffffff !important;
-		}
-	}
-	
-	/* #endif */
-	.ios_login {
-		width: 350rpx;
-		border-radius: 12rpx;
-		justify-content: center;
-		border: 1px solid #212121;
-		margin: 24rpx auto;
-		padding: 15rpx;
-		background-color: #212121;
-		color: #ffffff;
-		font-size: 32rpx;
-		.loginIcon {
-			font-size: 35rpx;
-			width: 35rpx;
-			height: 35rpx;
-		}
-		.weixin_text {
-			line-height: 1;
-			margin-left: 20rpx;
-			color: #ffffff !important;
-		}
-	}
-	
-page {
-	height: 100%;
-}
-.container {
-	width: 100%;
-	height: 100%;
-	background-size: 100%;
-}
-.container_text {
-	width: 100%;
-	height: 500rpx;
-	top: 0rpx;
-	.banner-img {
-		width: 100%;
-		height: 100%;
-	}
-}
-.login_text {
-	margin: auto 30rpx;
-	position: relative;
-	padding: 100rpx 102rpx;
-	background-color: #ffffff;
-	margin-top: -180rpx;
-	border-radius: 20rpx;
-	.login_input {
-		border-bottom: 1px solid #f0f0f0;
-		margin-bottom: 65rpx;
-		.login_img image {
-			height: 35rpx;
-			width: 29rpx;
-			margin-right: 20rpx;
-		}
-		.uni-input {
-			text-align: left;
-			width: 470rpx;
-			font-size: 28rpx !important;
-		}
-		.login_name {
-			color: #333333;
-		}
-	}
-
-	.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;
-	}
-
-	.uni-button-green {
-		color: #ffffff;
-		background-color: #5dbc7c;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-	}
-	.uni-button-green-plain {
-		border: 1px solid #5dbc7c;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-		color: #5dbc7c;
-		background-color: #ffffff;
-	}
-	.uni-button {
-		height: 85rpx;
-		line-height: 85rpx;
-	}
-}
-.loginTitle {
-	position: absolute;
-	top: 250rpx;
-	width: 100%;
-	text-align: center;
-	color: white;
-	font-size: 40rpx;
-}
+<template>
+	<view class="container">
+		<view class="container_text">
+			<image class="banner-img" src="/static/img/img01.png" mode="scaleToFill"></image>
+		</view>
+		<view class="loginTitle"><text>登录</text></view>
+		<view class="login_text">
+			<view class="login_input flex">
+				<view class="login_img">
+					<image src="/static/icon/img03.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input" v-model="username" focus placeholder="请输入手机号" />
+				</view>
+			</view>
+			<view class="login_input flex">
+				<view class="login_img">
+					<image src="/static/icon/img04.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="passward" focus
+						placeholder="请输入密码" /></view>
+			</view>
+			<view><button type="green" class="uni-button uni-button-green" @click="toLogin">登录</button></view>
+			<view><button type="green" class="uni-button uni-button-green uni-button-green-plain" plain="true"
+					hover-class="none" @click="register">注册</button></view>
+			<navigator url="./forget">
+				<view class="forget">忘记密码</view>
+			</navigator>
+			<!-- <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"><image src="/static/img/img05.png"></image></view>
+					<view class="weixin_text" @click="wecahtLogin">微信登录</view> -->
+			<!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<!-- <block v-if="!is_ios">
+						<view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png" mode="scaleToFill"></image></view>
+						<view class="weixin_text" @click="wecahtLogin">微信登录</view>
+					</block>
+					<block v-else>
+						<view class="ios_login flex" @click="wecahtLogin('weixin')">
+							<text class="iconfont iconweixin"></text>
+							<text class="weixin_text">微信登录</text>
+						</view>
+						<view v-if='is_apple_login' class="ios_login flex" @click="wecahtLogin('apple')">
+							<image class="loginIcon" src="/static/icon/appleIcon.png" mode=" scaleToFill"></image>
+							<text class="weixin_text">通过Apple登录</text>
+						</view>
+					</block> -->
+			<!-- #endif -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapMutations
+	} from 'vuex';
+	import {
+		login
+	} from '@/api/login.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	// #ifdef APP-PLUS
+	// applelogin接口需要开发编写，基础项目中可能没有
+	import {
+		applelogin
+	} from '@/api/set.js';
+	// loginWx接口需要开发编写，基础项目中可能没有
+	import {
+		loginWx
+	} from '@/api/login.js';
+	// #endif
+	// #ifdef H5
+	import {
+		loginWinxin
+	} from '@/utils/wxAuthorized';
+	// #endif
+	export default {
+		data() {
+			return {
+				username: '',
+				passward: '',
+				// #ifdef APP-PLUS
+				is_ios: false, //判断是否为ios手机
+				is_apple_login: false, //是否有ios授权登录功能
+				// #endif
+			};
+		},
+		onLoad() {
+			let obj = this;
+			// #ifdef APP-PLUS
+			let system = uni.getStorageSync('platform');
+			// 判断是否为ios
+			if (system == 'ios') {
+				obj.is_ios = true;
+			}
+			uni.getSystemInfo({
+				success(e) {
+					if (+e.system.split('.')[0] >= 13) {
+						obj.is_apple_login = true;
+					}
+				}
+			})
+			// #endif
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'login']),
+			// 微信登录
+			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) {
+						uni.getUserInfo({
+							provider: type,
+							success(es) {
+								if (type === 'weixin') {
+									loginWx(es.userInfo)
+										.then(e => {
+											uni.setStorageSync('token', e.data.token);
+											getUserInfo({}).then(e => {
+												obj.login();
+												// 保存返回用户数据
+												obj.setUserInfo(e.data);
+												//成功跳转首页
+												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'
+												});
+											});
+
+										})
+										.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
+						});
+					}
+				});
+				// #endif
+			},
+			//登录
+			async toLogin() {
+				let obj = this;
+				obj.logining = true;
+				if (obj.username == '') {
+					obj.$api.msg('请输入手机号');
+					return;
+				}
+				if (obj.passward == '') {
+					obj.$api.msg('请输入密码');
+					return;
+				}
+				login({
+						account: obj.username,
+						password: obj.passward
+					})
+					.then(function(e) {
+						console.log(e.data.token, "123456");
+						uni.setStorageSync('token', e.data.token);
+						// obj.$store.commit('hasLogin', true);
+						getUserInfo({}).then(e => {
+							obj.login();
+							// 保存返回用户数据
+							obj.setUserInfo(e.data);
+							let ur = uni.getStorageSync('present') || '/pages/index/index';
+							//成功跳转首页
+							uni.switchTab({
+								url: ur,
+								fail(e) {
+									uni.navigateTo({
+										url: ur,
+										fail(e) {
+											uni.navigateTo({
+												url: '/pages/index/index',
+											});
+										}
+									});
+								}
+							});
+						});
+					})
+					.catch(function(e) {
+						console.log(e);
+					});
+			},
+			//跳转注册页
+			register() {
+				uni.navigateTo({
+					url: `/pages/public/register`
+				});
+			},
+			// 后退
+			navBack() {
+				uni.navigateBack();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	/* #ifdef APP-PLUS */
+
+	.ios_login {
+		width: 260rpx;
+		border-radius: 12rpx;
+		justify-content: center;
+		border: 1px solid #212121;
+		margin: 24rpx auto;
+		padding: 10rpx;
+		background-color: #212121;
+		color: #ffffff;
+
+		.loginIcon {
+			width: 50rpx;
+			height: 50rpx;
+		}
+
+		.weixin_text {
+			line-height: 1;
+			margin-left: 20rpx;
+			color: #ffffff !important;
+		}
+	}
+
+	/* #endif */
+	.ios_login {
+		width: 350rpx;
+		border-radius: 12rpx;
+		justify-content: center;
+		border: 1px solid #212121;
+		margin: 24rpx auto;
+		padding: 15rpx;
+		background-color: #212121;
+		color: #ffffff;
+		font-size: 32rpx;
+
+		.loginIcon {
+			font-size: 35rpx;
+			width: 35rpx;
+			height: 35rpx;
+		}
+
+		.weixin_text {
+			line-height: 1;
+			margin-left: 20rpx;
+			color: #ffffff !important;
+		}
+	}
+
+	page {
+		height: 100%;
+	}
+
+	.container {
+		width: 100%;
+		height: 100%;
+		background-size: 100%;
+	}
+
+	.container_text {
+		width: 100%;
+		height: 500rpx;
+		top: 0rpx;
+
+		.banner-img {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.login_text {
+		margin: auto 30rpx;
+		position: relative;
+		padding: 100rpx 102rpx;
+		background-color: #ffffff;
+		margin-top: -180rpx;
+		border-radius: 20rpx;
+
+		.login_input {
+			border-bottom: 1px solid #f0f0f0;
+			margin-bottom: 65rpx;
+
+			.login_img image {
+				height: 35rpx;
+				width: 29rpx;
+				margin-right: 20rpx;
+			}
+
+			.uni-input {
+				text-align: left;
+				width: 470rpx;
+				font-size: 28rpx !important;
+			}
+
+			.login_name {
+				color: #333333;
+			}
+		}
+
+		.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;
+		}
+
+		.uni-button-green {
+			color: #ffffff;
+			background-color: #5dbc7c;
+			margin: 40rpx 10rpx;
+			border-radius: 50rpx;
+		}
+
+		.uni-button-green-plain {
+			border: 1px solid #5dbc7c;
+			margin: 40rpx 10rpx;
+			border-radius: 50rpx;
+			color: #5dbc7c;
+			background-color: #ffffff;
+		}
+
+		.uni-button {
+			height: 85rpx;
+			line-height: 85rpx;
+		}
+	}
+
+	.loginTitle {
+		position: absolute;
+		top: 250rpx;
+		width: 100%;
+		text-align: center;
+		color: white;
+		font-size: 40rpx;
+	}
 </style>

pages/public/register.vue

@@ -16,6 +16,10 @@
 			<view class="login_input flex">
 				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
 				<view class="login_name"><input class="uni-input" type="password" v-model="repassword" focus placeholder="请重复输入密码" /></view>
+			</view>
+			<view class="login_input flex">
+				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="payment_pas" focus placeholder="请输入交易密码" /></view>
 			</view>
 			<view class="login_input flex" style="display: none;">
 				<view class="login_img"><image src="/static/icon/img07.png"></image></view>
@@ -44,7 +48,8 @@ export default {
 			invitation: '', //邀请码
 			code: '', //验证码
 			time: '', //保存倒计时对象
-			countDown: 0 ,//倒计时
+			countDown: 0 ,//倒计时
+			payment_pas: ''//交易密码
 		};
 	},
 	onLoad() {
@@ -82,6 +87,10 @@ export default {
 			if (obj.repassword != obj.password) {
 				obj.$api.msg('两次密码不正确');
 				return;
+			}
+			if( obj.payment_pas == '') {
+				obj.$api.msg('请输入交易密码');
+				return;
 			}
 			// if ((obj.invitation = '')) {
 			// 	obj.$api.msg('请输入邀请码');
@@ -95,7 +104,8 @@ export default {
 				account: obj.phone, //账号
 				captcha: obj.code, //验证码
 				password: obj.password ,//密码
-				spread:this.invitation//上级推广人
+				spread: obj.invitation,//上级推广人
+				payment_pas: obj.payment_pas
 			}).then(function(e) {
 				uni.showToast({
 					title:'注册成功',

pages/set/userinfo.vue

@@ -17,7 +17,7 @@
 			<input class="input" type="text"  disabled="true" v-model="userInfo.phone" placeholder-class="placeholder" />
 		</view>
 		<view class="add-btn" @click="confirm">提交</view>
-		<!-- <view class="out" @click="cancel">注销账户</view> -->
+		<view class="out" @click="cancel">退出</view>
 		<uni-popup ref="popup" type="center">
 			<view class="psw-wrapper">
 				<view class="psw-title">请输入自己的账户</view>
@@ -91,7 +91,24 @@ export default {
 			});
 		},
 		cancel(){
-			this.$refs.popup.open();
+			// this.$refs.popup.open();
+			let obj = this;
+			uni.showModal({
+				content: '确定要退出登录么',
+				success: e => {
+					if (e.confirm) {
+						logout({}).then(e => {
+								obj.logout();
+								uni.switchTab({
+									url: '/pages/index/index'
+								})
+							})
+							.catch(e => {
+								console.log(e);
+							});
+					}
+				}
+			});
 		},
 		qx() {
 			this.password = '';
@@ -174,10 +191,10 @@ export default {
 		margin: 0 auto 30rpx;
 		width: 560rpx;
 		height: 80rpx;
-		border: 1px solid #32C6FF;
+		border: 1px solid  #DC262B;
 		background: #FFFFFF;
 		border-radius: 40px;
-		color: #32C6FF;
+		color:  #DC262B;
 	}
 	.psw-wrapper {
 		width: 548rpx;

pages/user/myggz.vue

@@ -285,7 +285,7 @@ page {
 .money-box {
 	position: relative;
 	z-index: 2;
-	padding-top: 90rpx;
+	padding-top: 20rpx;
 	color: #ffffff;
 	text-align: center;
 	.money {

pages/user/mygwjf.vue

@@ -283,7 +283,7 @@ page {
 .money-box {
 	position: relative;
 	z-index: 2;
-	padding-top: 90rpx;
+	padding-top: 20rpx;
 	color: #ffffff;
 	text-align: center;
 	.money {

pages/user/mythq.vue

@@ -283,7 +283,7 @@ page {
 .money-box {
 	position: relative;
 	z-index: 2;
-	padding-top: 90rpx;
+	padding-top: 20rpx;
 	color: #ffffff;
 	text-align: center;
 	.money {

pages/user/shareQrCode.vue

@@ -1,283 +1,143 @@
 <template>
-	<view class="content">
-		<!-- <view class="qrimg">
-			<tki-qrcode
-				:cid="cid"
-				ref="qrcode"
-				:val="val"
-				:size="size"
-				:unit="unit"
-				:background="background"
-				:foreground="foreground"
-				:pdground="pdground"
-				:icon="icon"
-				:iconSize="iconSize"
-				:lv="lv"
-				:onval="onval"
-				:loadMake="loadMake"
-				:usingComponents="usingComponents"
-				@result="qrR"
-			/>
-		</view> -->
-		<!-- #ifndef MP-ALIPAY -->
-		<canvas :class="{ qrimg: !loading }" @longtap="alertCanv" id="qrShareBox" canvas-id="qrShareBox" class="tki-qrcode-canvas" />
-		<!-- #endif -->
-		<!-- #ifdef MP-ALIPAY -->
-		<canvas :class="{ qrimg: !loading }" @longtap="alertCanv" id="qrShareBox" class="tki-qrcode-canvas" />
-		<!-- #endif -->
-		<view :style="{ display: loading ? 'none' : 'block' }" class="tki-qrcode-canvas"><image :src="ctxSrc" mode="scaleToFill" class="tki-qrcode-canvas"></image></view>
-		<view class="share-bottom flex" :class="{ 'action-share-bottom': !loading }" @click="loading ? showImg() : ''">
-			<text>{{ loading ? '点击生成图片' : '长按二维码下载' }}</text>
-		</view>
+	<view class="container">
+		<image @longtap="bc_code" class="backImg" :src="backImg"></image>
+		<view class="tki-qrcode"><canvas @longtap="bc_code" canvas-id="qrcode" /></view>
 	</view>
 </template>
 
 <script>
-// import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue';
 import { spreadBanner } from '@/api/user.js';
 export default {
 	// components: { tkiQrcode },
 	data() {
 		return {
-			cid: 'tki-qrcode-canvas', //canvasId，页面存在多个二维码组件时需设置不同的ID
-			size: 180, //生成的二维码大小
-			unit: 'upx', //大小单位尺寸
-			// show: true,//默认使用组件中的image标签显示二维码
-			val: '', //要生成的内容
-			background: '#ffffff', //二维码背景色
-			foreground: '#333333', //二维码前景色
-			pdground: '#333333', //二维码角标色
-			icon: '', //二维码图标URL（必须是本地图片，网络图需要先下载至本地）
-			iconSize: 40, //二维码图标大小
-			lv: 3, //容错级别
-			onval: false, //监听val值变化自动重新生成二维码
-			loadMake: false, //组件初始化完成后自动生成二维码，val需要有值
-			usingComponents: false, //是否使用了自定义组件模式（主要是为了修复非自定义组件模式时 v-if 无法生成二维码的问题）
-			showLoading: false, //是否显示loading
-			loadingText: '二维码生成中', //loading文字
-			src: '', // 二维码生成后的图片地址或base64
-			ratio: 1, //页面比例用于计算
-			ctxSrc: '', //要显示的图片
-			loading: true,//是否载入图片中
-			canHeight: '',//画布高度
-			canWeidth: ''//画布宽度
+			url: '',
+			backImg: '',
+			userInfo: ''
 		};
 	},
 	onLoad() {
-		this.loadCodeList()
+		this.spread();
 	},
-	onReady() {
-		let obj = this;
-		let query = uni.createSelectorQuery();
-		// 获取页面比例
-		query
-			.select('.content')
-			.fields(
-				{
-					size: true
-				},
-				e => {
-					// 保存比例
-					this.ratio = e.width / 750;
-				}
-			)
-			.exec();
-		// 获取画布宽高信息
-		query
-			.select('#qrShareBox')
-			.fields(
-				{
-					size: true
-				},
-				e => {
-					// 保存画布宽高信息
-					obj.canHeight = e.height;
-					obj.canWeidth = e.width;
-				}
-			)
-			.exec();
+	computed: {
+		cpSize() {
+			if (this.unit == 'upx') {
+				return uni.upx2px(this.size);
+			} else {
+				return this.size;
+			}
+		}
 	},
 	methods: {
-		loadCodeList() {
-			// 加载二维码信息
+		spread() {
+			uni.showLoading({
+				title: '加载中'
+			});
+			let obj = this;
 			spreadBanner({
-				// #ifdef H5
+				//#ifdef H5
 				type: 2,
-				// #endif
-				// #ifdef MP
-				type: 1
-				// #endif
-			}).then(e => {
-				console.log(e);
-				// #ifdef MP
-				// 保存二维码图片
-				uni.downloadFile({
-					url: e.data[0].wap_posterQr,
-					success(res) {
-						if (res.errMsg == 'downloadFile:ok') {
-							obj.src = res.tempFilePath;
-							// 生成画布
-							obj.loadImg(obj.src);
-							uni.hideLoading();
-						}
-						console.log(res);
-					},
-					fail(e) {
-						console.log(e);
-					}
-				})
-				// #endif
-				// #ifdef H5
-					// 保存二维码图片
-					this.src =  e.data[0].wap_posterQr;
-					// 生成画布
-					this.loadImg(e.data[0].wap_posterQr);
-				// #endif
-				
-			}).catch((e) => {
-					uni.showModal({
-						title: '生成失败请刷新页面',
-						showCancel: false
-					});
-					uni.hideLoading();
-				});;
-		},
-		// 长按画布事件
-		alertCanv() {
-			uni.showModal({
-				title: '请先点击生成图片再下载',
-				showCancel: false
+				//#endif
+				//#ifdef MP
+				type:1,
+				//#endif
+				//#ifdef APP-PLUS
+				type:2,
+				//#endif
+			}).then(({ data }) => {
+				console.log(data);
+				//#ifdef MP
+				obj.backImg = data[0].poster;
+				//#endif
+				//#ifdef H5
+				obj.backImg = data[0].wap_poster;
+				//#endif
+				//#ifdef APP-PLUS
+				obj.backImg = data[0].wap_poster;
+				//#endif
+				uni.hideLoading();
 			});
 		},
-		// 生成图片
-		showImg() {
-			uni.showLoading({
-				title: '图片生成中',
-				mask: true
-			});
-			let obj = this;
-			//因为和uni.showLoading载入效果冲突需要延迟执行生成图片方法
-			setTimeout(function() {
-				uni.canvasToTempFilePath({
-					x: 0,
-					y: 0,
-					width: obj.canWeidth,
-					height: obj.canHeight,
-					destWidth: obj.canWeidth,
-					destHeight: obj.canHeight,
-					fileType: 'jpg',
-					quality: 1,
-					canvasId: 'qrShareBox',
-					success: res => {
-						uni.hideLoading();
-						uni.showModal({
-							title: '创建成功，长按二维码下载图片',
-							showCancel: false
+		bc_code() {
+			let that = this;
+			console.log('保存二维码', this.backImg);
+			uni.downloadFile({
+				//获得二维码的临时地址
+				url: this.backImg,
+				success: res => {
+					//console.log('获取url',res)
+					if (res.statusCode == 200) {
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath, //传入临时地址
+							success() {
+								that.$api.msg('保存成功'); //封装的提示
+							},
+							fail() {
+								that.$api.msg('保存失败');
+							}
 						});
-						// 显示生成的图片
-						obj.loading = false;
-						// 保存图片base64
-						obj.ctxSrc = res.tempFilePath;
-					},
-					fail(e) {
-						console.log(e);
 					}
-				});
-			}, 50);
-		},
-		// 开始渲染画布
-		loadImg(src) {
-			const obj = this;
-			const cavWidth=523;//画布宽度
-			const cavHeight=700;//画布高度
-			const ratio = obj.ratio;//获取页面比例
-			const ctxBg = '/static/img/img14.jpg'; //画布背景
-			let context = uni.createCanvasContext('qrShareBox');
-			const codeSize = obj.size * ratio; //计算二维码大小
-			const codeX = ((cavWidth - obj.size) * ratio) / 2; //二维码所在x轴位置
-			const codeY = cavHeight * ratio; //二维码所在y轴位置
-			const codeBoxColor = '#FFFFFF'; //包裹框颜色
-			const codeBoxWidht = 0; //包裹边框宽度
-			const codeBoxSize = (codeBoxWidht / 2) * ratio; //计算二维码白色包裹框大小
-			const codeBoxX = codeX - codeBoxSize; //包裹框初始X轴
-			const codeBoxY = codeY - codeBoxSize; //包裹框初始Y轴
-			const codeBoxEnd = codeSize + codeBoxWidht * ratio; //计算包裹框大小
-			const fontTop = codeY + codeBoxEnd + (codeBoxWidht + 20) * this.ratio; //文字距离上边距高度
-			const fontSize = 24 * ratio; //文字大小
-			const fontText = ''; //文字内容
-			const fontLeft = (codeSize - fontSize * fontText.length) / 2 + codeX; //文字左侧距离
-			// 插入背景图片
-			context.drawImage(ctxBg, 0, 0, obj.canWeidth, obj.canHeight);
-			// // 插入文字
-			context.setFontSize(fontSize);
-			context.fillText(fontText, fontLeft, fontTop);
-			// 插入边框
-			context.beginPath();//开始画线
-			context.setLineJoin('round'); //边框类型
-			context.setLineWidth(codeBoxWidht * ratio);
-			context.setStrokeStyle(codeBoxColor); //设置包裹框颜色
-			context.strokeRect(codeBoxX, codeBoxY, codeBoxEnd, codeBoxEnd);
-			context.stroke();//渲染线条
-			// 插入二维码
-			context.drawImage(src, codeX, codeY, codeSize, codeSize);
-			// 开始渲染
-			context.draw();
-		},
-		// 創建二维码
-		creatQrcode() {
-			this.$refs.qrcode._makeCode();
-		},
-		// 保存二维码到图库
-		saveQrcode() {
-			this.$refs.qrcode._saveCode();
-		},
-		// 生成二维码后返回base64
-		qrR(res) {
-			this.src = res;
-		},
-		//清空二维码（清空二维码会触发result回调 返回值为空）
-		clearQrcode(e) {
-			this.$refs.qrcode._clearCode();
-			this.val = '';
+				}
+			});
 		}
 	}
 };
 </script>
 
 <style lang="scss">
-.content {
-	padding-top: 30rpx;
+page {
+	width: 100%;
+	min-height: 100%;
+	.container {
+		width: 100%;
+		height: 100%;
+	}
 }
-// #qrShareBox {
-// 	position: absolute;
-// 	left: -9999rpx;
-// 	top: -9999rpx;
-// }
-
-.qrimg {
+.backImg {
 	position: absolute;
-	left: -9999rpx;
-	top: -9999rpx;
+	width: 100%;
+	height: 100%;
+}
+.portrait {
+	width: 100%;
+	text-align: center;
+	padding-top: 80rpx;
+	padding-bottom: 30rpx;
+	image {
+		width: 250rpx;
+		height: 250rpx;
+	}
 }
-.tki-qrcode-canvas {
-	// width: 700rpx;
-	// height: 1245rpx;
-	width: 532rpx;
-	height: 945rpx;
-	margin: 0 auto;
+.text {
+	text-align: center;
+	width: 100%;
+	color: #ffffff;
+	font-size: 55rpx;
+	letter-spacing: 15rpx;
 }
-.share-bottom {
-	width: 560rpx;
-	height: 80rpx;
+.uid-name {
+	padding: 50rpx 0rpx;
+	text-align: center;
+	width: 100%;
 	color: #ffffff;
-	background-color: $base-color;
-	margin: 0 auto;
-	font-size: $font-lg - 2rpx;
-	margin-top: 30rpx;
-	border-radius: 99rpx;
-	justify-content: center;
-	&.action-share-bottom {
-		background-color: $color-gray;
-	}
+}
+.copy-btn {
+	color: #ffffff;
+	background-color: #4ba6ed;
+	border-radius: 50rpx;
+	width: 170rpx;
+	line-height: 70rpx;
+	margin: 0rpx auto;
+	text-align: center;
+}
+.tki-qrcode {
+	position: fixed;
+	bottom: 10%;
+	left: 30%;
+}
+canvas {
+	width: 150px;
+	height: 150px;
+	margin: auto;
 }
 </style>

pages/user/user.vue

@@ -4,7 +4,7 @@
 		<view class="top-image"><image src="../../static/user/user-top.png" mode=""></image></view>
 		<view class="user-set flex">
 			<view class="set-logo" @click="navTo('/pages/set/userinfo')"><image src="../../static/user/user1.png" mode=""></image></view>
-			<view class="xx-logo"><image src="../../static/user/user2.png" mode=""></image></view>
+			<!-- <view class="xx-logo"><image src="../../static/user/user2.png" mode=""></image></view> -->
 		</view>
 		<view class="user-wrap">
 			<view class="info-left flex">
@@ -32,15 +32,15 @@
 			</view>
 			<view class="main flex">
 				<view class="item" @click="navTo('/pages/user/mygwjf')">
-					<view class="item-num">{{ userInfo.sp_final}}</view>
+					<view class="item-num">{{ userInfo.sp_final || 0}}</view>
 					<view class="item-font">购物积分</view>
 				</view>
 				<view class="item" @click="navTo('/pages/user/mythq')">
-					<view class="item-num">{{userInfo.top_ticket }}</view>
+					<view class="item-num">{{userInfo.top_ticket || 0}}</view>
 					<view class="item-font">提货券</view>
 				</view>
 				<view class="item" @click="navTo('/pages/user/myggz')">
-					<view class="item-num">{{userInfo.aid_val}}</view>
+					<view class="item-num">{{userInfo.aid_val || 0}}</view>
 					<view class="item-font">广告值</view>
 				</view>
 			</view>
@@ -73,7 +73,7 @@
 			</view>
 		</view>
 		<uni-list class="tool-list">
-			<uni-list-item title="邀请有礼" @click="navTo('/pages/user/collection')" thumb="/static/user/user10.png"></uni-list-item>
+			<uni-list-item title="邀请有礼" @click="navTo('/pages/user/shareQrCode')" thumb="/static/user/user10.png"></uni-list-item>
 			<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/user/user11.png"></uni-list-item>
 			<uni-list-item title="收款方式" @click="navTo('/pages/collection/collection')" thumb="/static/user/user12.png"></uni-list-item>
 			<uni-list-item title="客服中心" @click="openKf()" thumb="/static/user/user13.png"></uni-list-item>
@@ -568,6 +568,7 @@ page {
 	}
 }
 .user-set {
+	justify-content: flex-end;
 	view {
 		flex-shrink: 0;
 	}

pages/user/xfjfzz.vue

@@ -3,25 +3,26 @@
 		<view class="content-money">
 			<view class="flex">
 				<view class="buttom">
-					<view class="icon">{{ userInfo.anticipate | getMoneyStyle }}</view>
+					<view class="icon">{{ userInfo.now_money | getMoneyStyle }}</view>
 					<text class="text">可转账余额</text>
 				</view>
 			</view>
 		</view>
 		<view class="row-box">
-			<view class="title">收款人id</view>
-			<view class="row"><input class="input" type="number" v-model="card" placeholder="请输入收款人id" placeholder-class="placeholder" /></view>
+			<view class="title">收款人手机号</view>
+			<view class="row"><input class="input" type="number" v-model="card" placeholder="请输入收款人手机号" placeholder-class="placeholder" /></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 = userInfo.anticipate">全部转账</view>
+				<view class="buttom" @click="withdrawal = userInfo.now_money">全部转账</view>
 			</view>
 		</view>
 
-		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">提交申请</button>
+		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">提交申请</button>
+		<button class="back-btn up" @click="boblack">返回</button>
 	</view>
 </template>
 
@@ -99,11 +100,12 @@ export default {
 				});
 			} else {
 				let data = {
-					uid: obj.card, //编号
-					anticipate: obj.withdrawal //金额
+					phone: obj.card, //编号
+					money: obj.withdrawal //金额
 				};
 				transfer_accounts(data)
-					.then(e => {
+					.then(e => {
+						
 						// 允许按钮点击
 						obj.loding = false;
 						// 初始化提现金额
@@ -121,6 +123,15 @@ export default {
 						console.log();
 					});
 			}
+		},
+		boblack() {
+			uni.navigateBack({
+				fail(){
+					uni.switchTab({
+						url: '/pages/index/index'
+					})
+				}
+			})
 		}
 	}
 };
@@ -206,11 +217,21 @@ page {
 	width: 520rpx;
 	height: 80rpx;
 	border-radius: 20rpx;
-	margin: 140rpx auto;
+	margin: 140rpx auto 0;
 	font-size: 36rpx;
 	font-weight: bold;
 	color: #F8DABA;
 	background-color: #303030;
+}
+.back-btn  {
+	width: 520rpx;
+	height: 80rpx;
+	border-radius: 20rpx;
+	margin: 40rpx auto;
+	font-size: 36rpx;
+	font-weight: bold;
+	color: #303030;
+	background-color:#F8DABA;
 }
 .name {
 	background: #fff;

unpackage/cache/apk/apkurl

@@ -0,0 +1 @@
+https://ide.dcloud.net.cn/build/download/7f8dece0-bad3-11ec-af08-0d67776f93ba

unpackage/cache/certdata

@@ -0,0 +1,3 @@
+andrCertfile=C:/Users/admin/Desktop/sxg.keystore
+andrCertAlias=com.sxg.inc
+andrCertPass=7IwuiYJfyRjKKTfhI7sjzw==

unpackage/cache/wgt/__UNI__474F381/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>

unpackage/cache/wgt/__UNI__474F381/app-config.js

@@ -0,0 +1 @@
+(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);