yuee

.gitignore

@@ -0,0 +1,2 @@
+/unpackage/dist
+.hbuilderx

manifest.json

@@ -1,105 +1,140 @@
-{
-    "name" : "基础项目",
-    "appid" : "__UNI__F0EBD91",
-    "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" : {},
-        /* 模块配置 */
-        "distribute" : {
-            /* 应用发布信息 */
-            "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\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
-            },
-            "ios" : {
-                "idfa" : false
-            },
-            /* ios打包配置 */
-            "sdkConfigs" : {
-                "maps" : {},
-                "oauth" : {
-                    "weixin" : {
-                        "appid" : "",
-                        "appsecret" : "",
-                        "UniversalLinks" : ""
-                    }
-                }
-            }
-        }
-    },
-    /* SDK配置 */
-    "quickapp" : {},
-    /* 快应用特有相关 */
-    "mp-weixin" : {
-        /* 小程序特有相关 */
-        "usingComponents" : true,
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : true
-        }
-    },
-    // "h5" : {
-    //     "title" : "商城",
-    //     "domain" : "",
-    //     "router" : {
-    //         "base" : "/index/",
-    //         "mode" : "hash"
-    //     },
-    //     "devServer" : {
-    //         "proxy" : {
-    //             "/api" : {
-    //                 "target" : "http://192.168.0.101/api",
-    //                 // "changeOrigin": true,
-    //                 "pathRewrite" : {
-    //                     "/api" : "" // rewrite path
-    //                 }
-    //             }
-    //         }
-    //     }
-    // }
-	"h5" : {
-	        "title" : "正一药业",
-	        "domain" : "",
-	        "router" : {
-	            "base" : "/index/",
-	            "mode" : "hash"
-	        },
-	        "devServer" : {
-	            "proxy" : {
-	                "/api" : {
-	                    "target" : "http://po.frp.liuniu946.com", //请求的目标域名
-	                    "changeOrigin" : true,
-	                    // "secure": false,
-	                    "pathRewrite" : {
-	                                                // "^/api": "/"
-	                                        }
-	                }
-	            }
-	        }
-	    }  
-}
+{
+    "name" : "正一健康",
+    "appid" : "__UNI__A53E8B3",
+    "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" : {},
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "autoSdkPermissions" : true
+            },
+            "ios" : {
+                "idfa" : false
+            },
+            /* ios打包配置 */
+            "sdkConfigs" : {
+                "maps" : {},
+                "oauth" : {},
+                "geolocation" : {},
+                "payment" : {},
+                "push" : {},
+                "share" : {},
+                "speech" : {
+                    "ifly" : {}
+                },
+                "ad" : {}
+            },
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "unpackage/启动图/480.9.png",
+                    "xhdpi" : "unpackage/启动图/720.9.png",
+                    "xxhdpi" : "unpackage/启动图/1080.9.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"
+                    }
+                }
+            }
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "usingComponents" : true,
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : true
+        }
+    },
+    // "h5" : {
+    //     "title" : "商城",
+    //     "domain" : "",
+    //     "router" : {
+    //         "base" : "/index/",
+    //         "mode" : "hash"
+    //     },
+    //     "devServer" : {
+    //         "proxy" : {
+    //             "/api" : {
+    //                 "target" : "http://192.168.0.101/api",
+    //                 // "changeOrigin": true,
+    //                 "pathRewrite" : {
+    //                     "/api" : "" // rewrite path
+    //                 }
+    //             }
+    //         }
+    //     }
+    // }
+    "h5" : {
+        "title" : "正一药业",
+        "domain" : "",
+        "router" : {
+            "base" : "/index/",
+            "mode" : "hash"
+        },
+        "devServer" : {
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://po.frp.liuniu946.com", //请求的目标域名
+                    "changeOrigin" : true,
+                    // "secure": false,
+                    "pathRewrite" : {}
+                }
+            }
+        }
+    }
+}
+// "^/api": "/"
+

pages.json

@@ -191,14 +191,17 @@
 		{
 			"path": "pages/user/extension",
 			"style": {
-				"navigationBarTextStyle": "black",
-				"navigationBarBackgroundColor": "transparent",
-				"app-plus": {
-					"titleNView": {
-						"type": "float",
-						"titleText": "我的推广"
-					}
-				}
+				// "navigationBarTextStyle": "black",
+				// "navigationBarBackgroundColor": "transparent",
+				// "app-plus": {
+				// 	"titleNView": {
+				// 		"type": "float",
+				// 		"titleText": "我的推广"
+				// 	}
+				// }
+				"navigationBarTitleText": "我的推广",
+				"navigationBarBackgroundColor":"#D7EEB6",
+				"navigationBarTextStyle":"black"
 			}
 		},
 		// {
@@ -350,45 +353,47 @@
 		{
 			"path": "pages/story/storyDetail",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				// "navigationBarTextStyle": "black",
+				"navigationBarTitleText": "",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
 			}
 		},
 		{
 			"path": "pages/user/jiedian",
 			"style": {
-				"navigationBarBackgroundColor": "transparent",
-				"app-plus": {
-					"titleNView": {
-						"type": "float",
-						"titleText": "我的接点"
-					}
-				}
+				"navigationBarTitleText": "我的推广",
+				"navigationBarBackgroundColor":"#D7EEB6",
+				"navigationBarTextStyle":"black"
 			}
 		},
 		{
 			"path": "pages/user/integral",
 			"style": {
-				"navigationBarTextStyle": "black",
-				"navigationBarBackgroundColor": "transparent",
-				"app-plus": {
-					"titleNView": {
-						"type": "float",
-						"titleText": "我的积分"
-					}
-				}
+				"navigationBarTitleText": "我的积分",
+				"navigationBarBackgroundColor":"#D7EEB6",
+				"navigationBarTextStyle":"black"
 			}
 		},
 		{
 			"path": "pages/user/transfer",
 			"style": {
-				"navigationBarTitleText": "佣金转账"
+				"navigationBarTitleText": "佣金转账",
+				"navigationBarBackgroundColor":"#fff",
+				"navigationBarTextStyle":"black"
 				
 			}
 		},
 		{
 			"path": "pages/user/registerList",
 			"style": {
-				"navigationBarTitleText": "报单列表"
+				"navigationBarTitleText": "报单列表",
+				"navigationBarBackgroundColor":"#D7EEB6",
+				"navigationBarTextStyle":"black"
 				
 			}
 		}

pages/index/fugou.vue

@@ -261,8 +261,9 @@ export default {
 				fugou(data).then(({ data }) => {
 					console.log('fufei', data);
 					uni.hideLoading();
-					if (data.status == 'PAY_ERROR') {
+					if (data.status == 'PAY_DEFICIENCY') {
 						console.log(data);
+						this.$api.msg('支付失败')
 					}
 					if (data.status == 'SUCCESS') {
 						this.$refs.popupPay.close();
@@ -305,11 +306,13 @@ export default {
 
 					uni.hideLoading();
 					// #ifdef H5
-					if (data.status == 'PAY_ERROR') {
+					if (data.status == 'PAY_DEFICIENCY') {
 						console.log(data);
+						this.$api.msg('支付失败')
 					}
 					if (data.status == 'SUCCESS') {
 						this.$refs.popupPay.close();
+						
 						uni.showModal({
 							title: '提示',
 							content: '支付成功！',

pages/public/login.vue

@@ -29,13 +29,13 @@
 			<!-- #ifndef APP-PLUS -->
 
 			<!-- <view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png"></image></view>
-			<view class="weixin_text" @click="wecahtLogin">微信登录</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> -->
+				<view class="weixin_text" @click="wecahtLogin">微信登录</view>
 			</block>
 			<block v-else>
 				<view class="ios_login flex" @click="wecahtLogin('weixin')">

pages/user/extension.vue

@@ -23,36 +23,6 @@
  		</view>
  		<swiper :current="tabCurrentIndex" :style="{ height: maxheight + 'px' }" class="swiper-box" duration="300" @change="changeTab">
  			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<!-- <view class="tg-wrapper">
-					<view class="tg-box">
-						<view class="tg-item">
-							<view class="tg-tit">
-								会员
-							</view>
-							<view class="tg-val">
-								10人
-							</view>
-						</view>
-						<view class="tg-jg"></view>
-						<view class="tg-item">
-							<view class="tg-tit">
-								店长
-							</view>
-							<view class="tg-val">
-								10人
-							</view>
-						</view>
-						<view class="tg-jg"></view>
-						<view class="tg-item">
-							<view class="tg-tit">
-								代理
-							</view>
-							<view class="tg-val">
-								10人
-							</view>
-						</view>
-					</view>
-				</view> -->
  				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
  					<!-- 空白页 -->
  					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
@@ -62,6 +32,9 @@
  						<view class="title-box flex_item">
  							<view class="title-avatar"><image :src="item.avatar"></image></view>
  							<view class="list_tpl">
+								<view class="title">
+									<text>{{ item.nickname }}</text>
+								</view>
  								<view class="time">
  									<text>{{ item.time }}</text>
  								</view>

pages/user/integral.vue

@@ -138,7 +138,6 @@ export default {
 <style lang="scss">
 .container {
 	width: 750rpx;
-	height: 1334rpx;
 	background-color: #f1f1f1;
 
 	.header {

pages/user/jiedian.vue

@@ -326,6 +326,7 @@ page {
 				padding: 10rpx;
 				background: #abd56f;
 				color: #fff;
+				height: 70rpx;
 			}
 			.headbox {
 				width: 154rpx;

pages/user/transfer.vue

@@ -1,68 +1,75 @@
 <template>
 	<view class="container">
 		<view class="top-two">
-			<view class="count">{{money || 0}}</view>
+			<view class="count">{{ money || 0 }}</view>
 			<view class="text">可转账佣金</view>
 		</view>
 		<view class="top-three">
 			<view class="text">收款人账户</view>
-				<input class="input" type="text" placeholder="请输入收款人账户" v-model="to_user_account"/>
+			<input class="input" type="text" placeholder="请输入收款人账户" v-model="to_user_account" />
 		</view>
 		<view class="top-three">
 			<view class="text">收款人UID</view>
-				<input class="input" type="number" placeholder="请输入收款人UID" v-model="to_uid"/>
+			<input class="input" type="number" placeholder="请输入收款人UID" v-model="to_uid" />
 		</view>
 		<view class="top-four">
 			<view class="text">转账数量</view>
 			<view class="row">
 				<text class="tit">￥</text>
-				<input class="input" type="number" placeholder="请输入转账数量" v-model="num"/>
+				<input class="input" type="number" placeholder="请输入转账数量" v-model="num" />
 			</view>
 		</view>
-			<view class="btn" @click="sub">提交申请</view>
-	</view>
-</template>
-
+		<view class="btn" @click="sub">提交申请</view>
+	</view>
+</template>
+
 <script>
-	import { trade, getSpreadCount } from '@/api/user.js'
+import { trade, getSpreadCount } from '@/api/user.js';
 export default {
-	data () {
+	data() {
 		return {
-			num: '',//转账金额
-			to_user_account: '',//收款人账户
-			to_uid: '',//收款人UID
-			money: 0,
-		}
+			num: '', //转账金额
+			to_user_account: '', //收款人账户
+			to_uid: '', //收款人UID
+			money: 0
+		};
 	},
 	onLoad() {
-		this.getNum()
+		this.getNum();
 	},
 	methods: {
-		nav (url) {
+		nav(url) {
 			uni.navigateTo({
 				url
-			})
+			});
 		},
 		sub() {
-			let obj = this
-			if(obj.num == '') {
-				return this.$api.msg('请输入收款人账户!')
+			let obj = this;
+			if (obj.num == '') {
+				return this.$api.msg('转账金额不能为空!');
 			}
-			if(to_user_account == '') {
-				return this.$api.msg('请输入收款人账户!')
+			if (obj.num * 1 > obj.money * 1) {
+				return this.$api.msg('可转账金额不足!');
 			}
-			if(obj.to_uid == '') {
-				return this.$api.msg('请输入转账金额!')
+			if (obj.to_user_account == '') {
+				return this.$api.msg('请输入收款人账户!');
 			}
-			if( +obj.num > +obj.money)
-			trade({
-				type: 'd',
-				num: obj.num,
-				to_user_account: obj.to_user_account,
-				to_uid: obj.to_uid
-			}).then( res => {
-				
-			})
+			if (obj.to_uid == '') {
+				return this.$api.msg('请输入转账金额!');
+			}
+				trade({
+					type: 'brokerage_price',
+					num: obj.num,
+					to_user_account: obj.to_user_account,
+					to_uid: obj.to_uid
+				}).then(res => {
+					uni.showToast({
+						title: '转账成功',
+						duration: 2000
+					});
+				}).catch(err =>{
+					console.log(err)
+				});
 		},
 		getNum() {
 			getSpreadCount({}, 3).then(({ data }) => {
@@ -71,95 +78,95 @@ export default {
 			});
 		}
 	}
-}
-</script>
-
+};
+</script>
+
 <style lang="scss">
-	.container {
-		background-color: #F2F3F5;
-		width: 750rpx;
-		// height: 1334rpx;
-		.top-two {
-			padding-bottom: 20rpx;
-			background-color: #fff;
-			.count {
-				text-align: center;
-				height: 50rpx;
-				font-size: 42rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #333333;
-				line-height: 110rpx;
-				margin: 0 auto;
-			}
-			.text {
-				width: 140rpx;
-				// height: 26rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #666666;
-				margin: 0 auto;
-				margin-top: 50rpx;
-			}
+.container {
+	background-color: #f2f3f5;
+	width: 750rpx;
+	// height: 1334rpx;
+	.top-two {
+		padding-bottom: 20rpx;
+		background-color: #fff;
+		.count {
+			text-align: center;
+			height: 50rpx;
+			font-size: 42rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+			line-height: 110rpx;
+			margin: 0 auto;
 		}
-		.top-three {
-			margin-top: 20rpx;
-			height: 160rpx;
-			background-color: #fff;
-			.text {
-				width: 150rpx;
-				height: 29rpx;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 400;
-				color: #333333;
-				line-height: 110rpx;
-				margin-left: 25rpx;
-			}
-			.input {
-				margin-top: 65rpx;
-				margin-left: 25rpx;
-			}
+		.text {
+			width: 140rpx;
+			// height: 26rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+			margin: 0 auto;
+			margin-top: 50rpx;
+		}
+	}
+	.top-three {
+		margin-top: 20rpx;
+		height: 160rpx;
+		background-color: #fff;
+		.text {
+			width: 150rpx;
+			height: 29rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			line-height: 110rpx;
+			margin-left: 25rpx;
+		}
+		.input {
+			margin-top: 65rpx;
+			margin-left: 25rpx;
+		}
+	}
+	.top-four {
+		margin-top: 20rpx;
+		height: 160rpx;
+		background-color: #fff;
+		.text {
+			width: 150rpx;
+			height: 29rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			line-height: 110rpx;
+			margin-left: 25rpx;
 		}
-		.top-four {
-			margin-top: 20rpx;
-			height: 160rpx;
-			background-color: #fff;
-			.text {
-				width: 150rpx;
-				height: 29rpx;
+		.row {
+			display: flex;
+			// justify-content: center;
+			margin-top: 65rpx;
+			margin-left: 20rpx;
+			.tit {
 				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: 400;
 				color: #333333;
-				line-height: 110rpx;
-				margin-left: 25rpx;
-			}
-			.row {
-				display: flex;
-				// justify-content: center;
-				margin-top: 65rpx;
-				margin-left: 20rpx;
-				.tit {
-					font-size: 30rpx;
-					font-family: PingFang SC;
-					font-weight: 400;
-					color: #333333;
-					margin-right: 10rpx;
-				}
+				margin-right: 10rpx;
 			}
 		}
-		.btn {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 674rpx;
-			height: 90rpx;
-			background: linear-gradient(-35deg, #F8DD4F, #FBEB77);
-			border-radius: 44rpx;
-			margin-top: 138rpx;
-			margin-left: 38rpx;
-		}
-	}
+	}
+	.btn {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 674rpx;
+		height: 90rpx;
+		background: linear-gradient(-35deg, #f8dd4f, #fbeb77);
+		border-radius: 44rpx;
+		margin-top: 138rpx;
+		margin-left: 38rpx;
+	}
+}
 </style>

pages/user/withdrawal.vue

@@ -1,40 +1,29 @@
 <template>
 	<view class="content">
-		<!-- <uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar> -->
 		<view class="content-money">
 			<view class="flex ">
-				<view class="buttom">
-					<view class="icon">{{ money | getMoneyStyle }}</view>
+				<view class="buttom" style="width: 100%;">
+					<view class="icon">{{ money || userInfo.now_money }}</view>
 					<text class="text">可提现金额</text>
 				</view>
-				<view class="interval"></view>
+				<!-- <view class="interval"></view>
 				<view class="buttom">
-					<view class=" icon">{{ freeze | getMoneyStyle }}</view>
+					<view class=" icon">{{ dai || 0 }}</view>
 					<text class="text">待审核提现金额</text>
-				</view>
+				</view> -->
 			</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="'最低提现金额' + minPrice + '元'" placeholder-class="placeholder" />
+				<input class="input" type="number" v-model="withdrawal" :placeholder="moneyMin" placeholder-class="placeholder" />
 				<view class="buttom" @click="withdrawal = money">全部提现</view>
 			</view>
 		</view>
-		<!-- #ifndef MP-WEIXIN -->
-		<view class="list" v-if="!weichatBsrowser">
+		<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">
@@ -48,10 +37,10 @@
 						</view>
 						<view class="right"><radio value="alipay" color="#5dbc7c" :checked="type == 'alipay'" /></view>
 					</view>
-				</label> -->
+				</label>
 				<label>
 					<view class="box">
-						<view class="icon iconfont"><image class="icon-img" src="../../static/icon/i8.png" mode="aspectFit"></image></view>
+						<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>
@@ -66,41 +55,50 @@
 				</label>
 			</radio-group>
 		</view>
-		<!-- #endif -->
 		<button class="add-btn up" @click="confirm">提交申请</button>
-		<button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/money/account')">账号管理</button>
+		<button class="add-btn modified" @click="navTo('/pages/money/account')">账号管理</button>
 	</view>
 </template>
 
 <script>
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
+import { mapState, mapMutations } from 'vuex';
+// import { getMoneyStyle } from '@/utils/rocessor.js';
+import { extractCash, extractBank, aliInfo, bankInfo,userBalance } from '@/api/wallet.js';
 import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
 export default {
-	filters: {
-		getMoneyStyle
-	},
+	// filters: {
+	// 	getMoneyStyle
+	// },
 	components: {
 		uniNoticeBar
 	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
 	data() {
 		return {
-			type: 'weixin', //提现方式
+			type: 'alipay', //提现方式
 			money: '0.00', //可提现金额
 			freeze: '0.0', //冻结金额
 			withdrawal: '', //提现金额
 			minPrice: '', //最少提现金额
 			aliData: {},
 			bankData: {},
+			dai: '',//待审核金额
 			// #ifdef H5
 			weichatBsrowser: false
 			// #endif
 		};
 	},
+	computed: {
+		moneyMin() {
+			return '最低提现金额' + this.minPrice + '元'
+		}
+	},
 	onLoad(options) {
-		// #ifdef H5
+		
 		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
-		// #endif
+		
 		//加载提现信息
 		this.loadData();
 		// 加载提款账号信息
@@ -127,11 +125,13 @@ export default {
 		},
 		// 加载余额信息
 		async loadData() {
-			extractBank({}).then(({ data }) => {
-				this.money = data.moneyCount;//可提现余额
-				this.minPrice = data.minPrice;//最小提现
-				this.freeze =data.inmoneyCount//提现中的余额
+			userBalance({}).then(({ data }) => {
+				this.money = data.now_money;
 			});
+			extractBank({}).then(({ data }) => {
+				this.minPrice = +data.minPrice;
+				this.dai = data.now_money_extract.toFixed(2);
+			})
 		},
 		// 跳转
 		navTo(url) {
@@ -145,10 +145,14 @@ export default {
 		},
 		// 提交
 		confirm() {
+			if (this.withdrawal%100 != 0) {
+				this.$api.msg('提现金额必须为整百')
+				return;
+			}
 			let data = {
 				extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
 				money: this.withdrawal, //金额
-				money_type: 1//0佣金1余额
+				balance_type: 1//0佣金1余额
 			}
 			if (this.type=='alipay') {
 				data.name = this.aliData.fullname;
@@ -159,18 +163,23 @@ export default {
 				data.bankname = this.bankData.bank;
 				data.cardnum = this.bankData.bankno;
 			}
-			
-			
+			uni.showLoading({
+				title: '提交中...',
+				mask: true
+			});
 			extractCash(data)
 				.then(e => {
+					uni.hideLoading();
 					uni.showToast({
 						title: '提交成功',
 						duration: 2000,
 						position: 'top'
 					});
+					// 重新加载数据
+					this.loadData()
 				})
 				.catch(e => {
-					console.log();
+					console.log(e);
 				});
 		}
 	}
@@ -193,6 +202,7 @@ page {
 	.buttom {
 		font-size: $font-lg;
 		width: 50%;
+		
 	}
 	.interval {
 		width: 2px;
@@ -220,6 +230,10 @@ page {
 		font-size: $font-base + 2rpx;
 		color: $font-color-dark;
 	}
+	.tip {
+		font-size: $font-base - 8rpx;
+		color: #c1c1c1;
+	}
 	.row {
 		display: flex;
 		align-items: center;
@@ -242,7 +256,7 @@ page {
 		}
 
 		.buttom {
-			color: $font-color-spec;
+			color: $base-color;
 			font-size: $font-base;
 		}
 	}
@@ -252,9 +266,10 @@ page {
 		color: $base-color;
 	}
 	&.up {
-		background-color: $base-color;
-		color: #fff;
+		background:$base-color;
+		color: #ffffff;
 	}
+	border: 1px solid $base-color;
 	display: flex;
 	align-items: center;
 	justify-content: center;

unpackage/cache/apk/apkurl

@@ -0,0 +1 @@
+https://service.dcloud.net.cn/build/download/5a26ba10-0c90-11ec-b3ba-83a573bc32b6

unpackage/cache/certdata

@@ -0,0 +1,3 @@
+andrCertfile=D:/工作/项目2/正一药业/zhengyi/unpackage/res/zy.keystore
+andrCertAlias=com.zy.inc
+andrCertPass=7IwuiYJfyRjKKTfhI7sjzw==

unpackage/cache/wgt/__UNI__A53E8B3/__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__A53E8B3/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()})([]);

unpackage/cache/wgt/__UNI__A53E8B3/static/css/cmy.css

@@ -0,0 +1,554 @@
+/*初始化类*/
+@font-face {
+	font-family: 'iconfont';
+	/* project id 1482221 */
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');
+}
+
+.acea-row {
+	display: -webkit-box;
+	display: -moz-box;
+	display: -webkit-flex;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-lines: multiple;
+	-moz-box-lines: multiple;
+	-o-box-lines: multiple;
+	-webkit-flex-wrap: wrap;
+	-ms-flex-wrap: wrap;
+	flex-wrap: wrap
+}
+
+.acea-row.row-middle {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center
+}
+
+.bg-color-red {
+	background-color: #e93323 !important;
+}
+
+.acea-row.row-right {
+	-webkit-box-pack: end;
+	-moz-box-pack: end;
+	-o-box-pack: end;
+	-ms-flex-pack: end;
+	-webkit-justify-content: flex-end;
+	justify-content: flex-end
+}
+
+.acea-row.row-between-wrapper {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	-webkit-box-pack: justify;
+	-moz-box-pack: justify;
+	-o-box-pack: justify;
+	-ms-flex-pack: justify;
+	-webkit-justify-content: space-between;
+	justify-content: space-between
+}
+
+.acea-row.row-column-around {
+	-webkit-flex-direction: column;
+	-ms-flex-direction: column;
+	flex-direction: column;
+	justify-content: space-around;
+	-webkit-justify-content: space-around
+}
+
+.acea-row.row-center-wrapper {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	-webkit-box-pack: center;
+	-moz-box-pack: center;
+	-o-box-pack: center;
+	-ms-flex-pack: center;
+	-webkit-justify-content: center;
+	justify-content: center
+}
+
+.iconfont {
+	font-family: "iconfont" !important;
+	font-size: 34rpx;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-webkit-text-stroke-width: 0rpx;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.iconedit:before {
+	content: "\e649";
+}
+
+.iconfavorfill:before {
+	content: "\e64b";
+}
+
+.iconfavor:before {
+	content: "\e64c";
+}
+
+.iconlocation:before {
+	content: "\e651";
+}
+
+.iconroundcheckfill:before {
+	content: "\e656";
+}
+
+.iconroundcheck:before {
+	content: "\e657";
+}
+
+.iconunfold:before {
+	content: "\e661";
+}
+
+.iconlikefill:before {
+	content: "\e668";
+}
+
+.iconlike:before {
+	content: "\e669";
+}
+
+.iconshop:before {
+	content: "\e676";
+}
+
+.iconcart:before {
+	content: "\e6af";
+}
+
+.icondelete:before {
+	content: "\e6b4";
+}
+
+.iconhome:before {
+	content: "\e6b8";
+}
+
+.iconcartfill:before {
+	content: "\e6b9";
+}
+
+.iconhomefill:before {
+	content: "\e6bb";
+}
+
+.iconlock:before {
+	content: "\e6c0";
+}
+
+.iconfriendadd:before {
+	content: "\e6ca";
+}
+
+.iconfold:before {
+	content: "\e6de";
+}
+
+.iconapps:before {
+	content: "\e729";
+}
+
+.iconadd:before {
+	content: "\e767";
+}
+
+.iconmove:before {
+	content: "\e768";
+}
+
+.icontriangledownfill:before {
+	content: "\e79b";
+}
+
+.icontriangleupfill:before {
+	content: "\e79c";
+}
+
+.iconshaixuan:before {
+	content: "\e74a";
+}
+
+.iconyanzhengma:before {
+	content: "\e684";
+}
+
+.iconjifen:before {
+	content: "\e60f";
+}
+
+.iconwuliuxinxi:before {
+	content: "\e62b";
+}
+
+.iconmessage:before {
+	content: "\e78a";
+}
+
+.iconsetting:before {
+	content: "\e78e";
+}
+
+.iconaddition:before {
+	content: "\e6e0";
+}
+
+.iconclose:before {
+	content: "\e6e9";
+}
+
+.iconenter:after {
+	content: "\e6f8";
+}
+
+.iconprompt:before {
+	content: "\e71b";
+}
+
+.iconreturn:before {
+	content: "\e720";
+}
+
+.iconsearch:before {
+	content: "\e741";
+}
+
+.iconpengyouquan:before {
+	content: "\e62c";
+}
+
+.iconweixin:before {
+	content: "\e60e";
+}
+
+.iconzhifubao:before {
+	content: "\e673";
+}
+
+.iconyue:before {
+	content: "\e618";
+}
+
+.iconweixin1:before {
+	content: "\e622";
+}
+
+.iconlock1:before {
+	content: "\e64d";
+}
+
+.iconuser:before {
+	content: "\e64e";
+}
+
+.iconchenggongtixianshouyi:before {
+	content: "\e64f";
+}
+
+.iconviptuiguangdingdan:before {
+	content: "\e650";
+}
+
+.icondaifukuan:before {
+	content: "\e652";
+}
+
+.icondaijiesuanshouyi:before {
+	content: "\e653";
+}
+
+.icondaidakuanshouyi:before {
+	content: "\e654";
+}
+
+.icondaifahuo:before {
+	content: "\e655";
+}
+
+.icondaishouhuoshouyi:before {
+	content: "\e658";
+}
+
+.icondaishouhuo:before {
+	content: "\e659";
+}
+
+.iconwuxiaoshouyi:before {
+	content: "\e65a";
+}
+
+.icontixianmingxi:before {
+	content: "\e65b";
+}
+
+.iconshouyi:before {
+	content: "\e65c";
+}
+
+.iconkouchutixianshouxufei:before {
+	content: "\e65d";
+}
+
+.iconyishenqingshouyi:before {
+	content: "\e65e";
+}
+
+.icontuihuanhuo:before {
+	content: "\e65f";
+}
+
+
+/*水平线*/
+.hr {
+	width: 100%;
+	position: relative;
+	border-bottom: 1px solid #dddddd;
+	/* height: 0.5rpx; */
+}
+
+/* 一行显示 */
+.clamp {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: block;
+}
+
+/* 二行显示 */
+.clamp2 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+/* 二行显示 */
+.ellipsis {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
+
+.common-hover {
+	background: #f5f5f5;
+}
+
+/* 角标 */
+.corner {
+	background-color: #e51c23;
+	position: absolute;
+	right: -18rpx;
+	top: -18rpx;
+	color: #FFFFFF;
+	text-align: center;
+	border-radius: 999px;
+	font-size: 24rpx !important;
+	min-width: 35rpx;
+	min-height: 35rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 1;
+}
+
+.flex_item {
+	display: flex;
+	align-items: center;
+	/* justify-content: space-between; */
+}
+
+/* 左右顶格加上下居中 */
+.flex-between-center {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+/* flex布局-整体居中 */
+.flex-center {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.flex-start {
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+}
+
+/*文字对齐*/
+.text-left {
+	text-align: left !important;
+}
+
+.text-center {
+	text-align: center !important;
+}
+
+.text-justify {
+	text-align: justify !important;
+}
+
+.text-right {
+	text-align: right !important;
+}
+
+.text-default {
+	color: #212121 !important;
+}
+
+.text-white {
+	color: #ffffff !important;
+}
+
+.text-primary {
+	color: #00bcd4 !important;
+}
+
+.text-success {
+	color: #009688 !important;
+}
+
+.text-info {
+	color: #03a9f4 !important;
+}
+
+.text-warning {
+	color: #ffc107 !important;
+}
+
+.text-danger {
+	color: #e51c23 !important;
+}
+
+.text-pink {
+	color: #e91e63 !important;
+}
+
+.text-purple {
+	color: #673ab7 !important;
+}
+
+.text-indigo {
+	color: #3f51b5 !important;
+}
+
+.text-gray {
+	color: #999999 !important;
+}
+
+.bg-default {
+	background-color: #f5f5f5 !important;
+}
+
+.bg-primary {
+	background-color: #00bcd4 !important;
+}
+
+.bg-success {
+	background-color: #009688 !important;
+}
+
+.bg-info {
+	background-color: #03a9f4 !important;
+}
+
+.bg-warning {
+	background-color: #FFB238 !important;
+}
+
+.bg-danger {
+	background-color: #DC4D46 !important;
+}
+
+.bg-pink {
+	background-color: #e91e63 !important;
+}
+
+.bg-purple {
+	background-color: #673ab7 !important;
+}
+
+.bg-indigo {
+	background-color: #3f51b5 !important;
+}
+
+.bg-white {
+	background-color: white !important;
+}
+
+.bg-gray {
+	background-color: #e3e3e3 !important;
+}
+
+/* 边框 */
+.border-radius-15 {
+	border-radius: 15rpx;
+}
+
+.border-radius-10 {
+	border-radius: 10rpx;
+}
+
+.border-radius-all {
+	border-radius: 1000rpx;
+}
+
+/* 底部边线 */
+.borde-b {
+	border-bottom: 1px solid #dddddd;
+}
+
+/* 弹性盒子 */
+.flex {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.items-left {
+	justify-content: flex-start;
+}
+
+.items-right {
+	justify-content: flex-end;
+}
+
+.flex-shrink-false {
+	flex-shrink: 0;
+}
+
+.flex-grow-true {
+	flex-grow: 1;
+}
+
+.position-relative {
+	position: relative;
+}
+.rich-img {
+		width: 100% !important;
+	}