Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51

# Conflicts:
#	pages/index/index.vue

package-lock.json

@@ -2070,6 +2070,44 @@
      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
      "dev": true
     },
+    "ansi-styles": {
+     "version": "4.3.0",
+     "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+     "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "color-convert": "^2.0.1"
+     }
+    },
+    "chalk": {
+     "version": "4.1.2",
+     "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+     "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "ansi-styles": "^4.1.0",
+      "supports-color": "^7.1.0"
+     }
+    },
+    "color-convert": {
+     "version": "2.0.1",
+     "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+     "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "color-name": "~1.1.4"
+     }
+    },
+    "color-name": {
+     "version": "1.1.4",
+     "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+     "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+     "dev": true,
+     "optional": true
+    },
     "fs-extra": {
      "version": "7.0.1",
      "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-7.0.1.tgz",
@@ -2081,6 +2119,13 @@
       "universalify": "^0.1.0"
      }
     },
+    "has-flag": {
+     "version": "4.0.0",
+     "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+     "dev": true,
+     "optional": true
+    },
     "jsonfile": {
      "version": "4.0.0",
      "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -2098,6 +2143,28 @@
      "requires": {
       "minipass": "^3.1.1"
      }
+    },
+    "supports-color": {
+     "version": "7.2.0",
+     "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+     "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "has-flag": "^4.0.0"
+     }
+    },
+    "vue-loader-v16": {
+     "version": "npm:vue-loader@16.8.3",
+     "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+     "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+     "dev": true,
+     "optional": true,
+     "requires": {
+      "chalk": "^4.1.0",
+      "hash-sum": "^2.0.0",
+      "loader-utils": "^2.0.0"
+     }
     }
    }
   },
@@ -13152,75 +13219,6 @@
     }
    }
   },
-  "vue-loader-v16": {
-   "version": "npm:vue-loader@16.8.3",
-   "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-   "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-   "dev": true,
-   "optional": true,
-   "requires": {
-    "chalk": "^4.1.0",
-    "hash-sum": "^2.0.0",
-    "loader-utils": "^2.0.0"
-   },
-   "dependencies": {
-    "ansi-styles": {
-     "version": "4.3.0",
-     "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-     "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-     "dev": true,
-     "optional": true,
-     "requires": {
-      "color-convert": "^2.0.1"
-     }
-    },
-    "chalk": {
-     "version": "4.1.2",
-     "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-     "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-     "dev": true,
-     "optional": true,
-     "requires": {
-      "ansi-styles": "^4.1.0",
-      "supports-color": "^7.1.0"
-     }
-    },
-    "color-convert": {
-     "version": "2.0.1",
-     "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-     "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-     "dev": true,
-     "optional": true,
-     "requires": {
-      "color-name": "~1.1.4"
-     }
-    },
-    "color-name": {
-     "version": "1.1.4",
-     "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-     "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-     "dev": true,
-     "optional": true
-    },
-    "has-flag": {
-     "version": "4.0.0",
-     "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-     "dev": true,
-     "optional": true
-    },
-    "supports-color": {
-     "version": "7.2.0",
-     "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-     "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-     "dev": true,
-     "optional": true,
-     "requires": {
-      "has-flag": "^4.0.0"
-     }
-    }
-   }
-  },
   "vue-style-loader": {
    "version": "4.1.3",
    "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz",

pages/login/login.vue

@@ -20,7 +20,12 @@
 						<view class="code">获取验证码</view>
 						<u-input v-model="tel" type="number" placeholder="请输入验证码" placeholder-style="font-size:16px;color:#ccc;"/>
 					</view>
-					<view class="tips">我已阅读并同意<span>《会员协议》</span>和<span>《隐私协议》</span></view>
+					<u-checkbox-group>
+						<u-checkbox class="tips" v-model="value" shape="circle" @change="checkboxChange()">
+							<view v-if="!value">我已阅读并同意<span>《会员协议》</span>和<span>《隐私协议》</span></view>
+							<view v-else>我已阅读并同意<span style="color: #000000;">《会员协议》</span>和<span style="color: #000000;">《隐私协议》</span></view>
+						</u-checkbox>
+					</u-checkbox-group>
 				</view>
 			</view>
 			
@@ -34,7 +39,8 @@
 export default {
 	data() {
 		return {
-			tel: ''
+			tel: '',
+			value: false,
 		}
 	},
 	computed: {
@@ -48,7 +54,9 @@ export default {
 		}
 	},
 	methods: {
-
+		checkboxChange() {
+			this.value = !this.value;
+		},
 	}
 };
 </script>

pages/user/finance/rechargeList.vue

@@ -1,8 +1,9 @@
 <template>
 	<view>
 		<u-navbar title="充值记录"></u-navbar>
-		<view class="rechargeTime">
-			<span>5月</span>
+		<view class="rechargeTime" @click="show = true">
+			<u-picker mode="time" v-model="show" :params="params" @confirm="confirmTime" @cancel="cancelTime"></u-picker>
+			<span>{{date.month}}月</span>
 			<u-icon name="arrow-down-s-fill" custom-prefix="custom-icon" color="#B3B3B3" size="32"></u-icon>
 		</view>
 		<view class="rechargeList">
@@ -30,11 +31,43 @@
 	export default {
 		data() {
 			return {
-				
+				params: {
+					year: true,
+					month: true,
+					day: false,
+					hour: false,
+					minute: false,
+					second: false,
+					timestamp: true,
+				},
+				show: false,
+				date: {
+					year: '',
+					month: '',
+				},
 			}
 		},
+		onReady() {
+			var date = new Date();
+			this.date.year = date.getFullYear();
+			this.date.month = date.getMonth() + 1;
+			console.log(this.date)
+		},
 		methods: {
-
+			confirmTime(params) {
+				var m = params.month.slice(0,1)
+				if(m == '0') {
+					this.date.month = params.month.slice(1,2);
+				} else {
+					this.date.month = params.month;
+				}
+				
+				this.date.year = params.year;
+				this.show = false;
+			},
+			cancelTime() {
+				this.show = false;
+			}
 		}
 	}
 </script>