From bbd54ac2882cadc18f622ef75aded6296494bd37 Mon Sep 17 00:00:00 2001
From: jcuser <2550960513@qq.com>
Date: Sat, 23 Jan 2021 11:15:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?components/c-tabbar-popup=20=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/index.js                              |   5 -
 api/mock/help-form.js                     |   5 +
 api/request.js                            |  11 +-
 assets/languages/Chinese.json             |   4 +
 assets/languages/English.json             |   4 +
 components/c-page/index.vue               |   2 +-
 components/c-popup/README.md              |  37 -----
 components/c-popup/index.vue              | 109 -------------
 components/c-tabbar-popup/index.vue       | 164 ++++++++++---------
 components/c-upload-image/README.md       |  37 -----
 components/c-upload-image/index.vue       |  64 --------
 manifest.json                             |   2 +-
 package.json                              |   2 +
 pages.json                                |  34 ++--
 pages/help-form/help-form.vue             | 189 ++++++++++------------
 pages/login/WXLogin.vue                   |  66 +++-----
 pages/setting/setting.vue                 |   2 +-
 pages/test/test.vue                       |   8 -
 pages/user/Personal-Data.vue              |   8 +-
 store/index.js                            |  28 +++-
 uview-ui/components/u-upload/u-upload.vue |   4 +-
 vue.config.js                             |  26 ---
 22 files changed, 263 insertions(+), 548 deletions(-)
 delete mode 100644 components/c-popup/README.md
 delete mode 100644 components/c-popup/index.vue
 delete mode 100644 components/c-upload-image/README.md
 delete mode 100644 components/c-upload-image/index.vue
 delete mode 100644 vue.config.js

diff --git a/api/index.js b/api/index.js
index 6084708..0a668eb 100644
--- a/api/index.js
+++ b/api/index.js
@@ -11,10 +11,5 @@ export const helpInfo = {
 
 export const helpForm = {
     getTags: helpFormMock.getTags,
-    addInformation: (params)=>request.post("/information/addInformation",params),
-}
-
-export const login = {
-    WXLogin: (params)=>request.post("/user/Thirdlogin",params)
 }
 
diff --git a/api/mock/help-form.js b/api/mock/help-form.js
index 2145e26..a9042d5 100644
--- a/api/mock/help-form.js
+++ b/api/mock/help-form.js
@@ -6,21 +6,26 @@ export default {
         name: '带饭',
         enName:'Bring Meal',
         id: '1',
+		img:'/static/images/logo.png'
     }, {
         name: '外卖',
         enName:'Take Out',
         id: '2',
+		img:'/static/images/logo.png'
     }, {
         name: '失物招领',
         enName:'Lost And Found',
         id: '3',
+		img:'/static/images/logo.png'
     }, {
         name: '代取快递',
         enName:'Express',
         id: '4',
+		img:'/static/images/logo.png'
     }, {
         name: '二手书',
         enName:'Used Books',
         id: '5',
+		img:'/static/images/logo.png'
     }])
 }
diff --git a/api/request.js b/api/request.js
index 6a7cafb..46aabf2 100644
--- a/api/request.js
+++ b/api/request.js
@@ -1,9 +1,7 @@
 import uni_request from './requestAxios.js'
-import Vue from "vue"
-import store from "../store"
 
 const request = uni_request({ // 有效配置项只有三个
-    baseURL: 'http://121.5.12.180:80', //baseURL
+    baseURL: 'http://120.24.151.246:80', //baseURL
     timeout: 12345, // 超时时间，单位毫秒。默认 60 秒
     header: {'x-custom-header': 'x-custom-header'}, // 设置请求头，建议放在请求拦截器中
     statusCode: [200, 401] // 服务器相应状态码为 200/401 时，网络请求不会 reject。也就是不会被 catch 到。如响应 401 时可以在响应拦截后 await 刷新 token + await 重新请求 + return response。即可实现无痛刷新。
@@ -14,18 +12,13 @@ request.interceptors.request.use(async (config, ...args) => {
     //config.header.Authorization = 'Bearer ' + $store.state.app.token // 修改请求头
     //config.body.test = 'test' // 修改请求体
     // config.cancel = true // 取消请求
-    config.header.token = store.state.token
     return config
 })
 
 request.interceptors.response.use(async (response, ...args) => { // 响应拦截器（可以设置多个, 同时可以也可以使用异步方法）
     const {data: res} = response // args[0] method args[1] url args[3] data
     //await new Promise(resolve => setTimeout(() => resolve(), 3000))
-    console.log(response);
-    if (res.token) {
-        store.commit("setToken",res.token)
-    }
-    if (res.state === 200) {
+    if (res.code === 200) {
         //console.log('响应拦截器， 会阻塞 3 s')
     }
     return response
diff --git a/assets/languages/Chinese.json b/assets/languages/Chinese.json
index a28f3da..1f61aeb 100644
--- a/assets/languages/Chinese.json
+++ b/assets/languages/Chinese.json
@@ -64,5 +64,9 @@
     "submit": "发布",
     "chooseLocation": "选择任务地点",
     "location": "任务地点"
+  },
+  "cTabberPopup":{
+	  "title1":"求助",
+	  "title2":"动态"
   }
 }
\ No newline at end of file
diff --git a/assets/languages/English.json b/assets/languages/English.json
index 323c9c6..92beb6e 100644
--- a/assets/languages/English.json
+++ b/assets/languages/English.json
@@ -63,5 +63,9 @@
     "submit":"Submit",
     "chooseLocation": "Select mission location",
     "location": "Location"
+  },
+  "cTabberPopup":{
+  	  "title1":"Help",
+  	  "title2":"Trends"
   }
 }
\ No newline at end of file
diff --git a/components/c-page/index.vue b/components/c-page/index.vue
index c2a6eab..2f7a551 100644
--- a/components/c-page/index.vue
+++ b/components/c-page/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <view :class="['page']">
+  <view :class="['page','blackTheme']">
     <!--导航栏-->
     <c-navbar :back-text="$t('page.back')"
               title-color="#fff"
diff --git a/components/c-popup/README.md b/components/c-popup/README.md
deleted file mode 100644
index f48338a..0000000
--- a/components/c-popup/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# c-popup
-作者：jcuser
-
-Email: 2550960513@qq.com
-
-这里是 c-popup 组件的基本作用,记得写这个组件是干嘛的。
-
-## 使用方式
-**在 script 中引用组件**
-
-```vue
-import Cpopup from "@/components/c-popup"
-export default {
-    components: { Cpopup }
-}
-```
-
-**在 template 中使用组件**
-
-```vue
-<c-popup></c-popup>
-```
-
-# 属性说明
-
-## props
-|属性名 |是否必填 |	类型 |	默认值 |	说明 |
-|-------|---------|--------|-----|-----|
-|无 |否 |	无 |	无 |	无 |
-
-
-# 事件说明
-
-## event
-| 事件名	| 是否必填	| 事件说明 | 返回参数 |
-|-------|---------|--------|--------|
-|无|否|无|无 |
\ No newline at end of file
diff --git a/components/c-popup/index.vue b/components/c-popup/index.vue
deleted file mode 100644
index ef144a7..0000000
--- a/components/c-popup/index.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-  <view>
-    <!-- 发布弹窗 -->
-    <u-popup v-model="showPopup" mode="bottom" z-index="999">
-      <view class="createBox">
-        <text class="selectTitle">需求</text>
-        <view class="selectBtns">
-          <view class="selectBtn" v-for="index in 5" @tap="toHelpForm">
-            <view class="selectBtnIcon"></view>
-            <text class="selectBtnText">送货</text>
-          </view>
-        </view>
-
-        <text class="selectTitle">动态</text>
-        <view class="selectBtns">
-          <view class="selectBtn" v-for="index in 5" @tap="toHelpForm">
-            <view class="selectBtnIcon"></view>
-            <text class="selectBtnText">送货</text>
-          </view>
-        </view>
-      </view>
-      <view class="closeBtnStyle" @tap="closePopup"></view>
-    </u-popup>
-  </view>
-</template>
-
-<script>
-import UPopup from "../../uview-ui/components/u-popup/u-popup";
-export default {
-  name: "c-popup",
-  components: { UPopup },
-  props: {
-    // 显示与否
-    showPopup: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      msg: "c-popup组件\n标题都不写，这不是什么善茬",
-    };
-  },
-  methods: {
-    closePopup() {
-      this.showPopup = false;
-    },
-    toHelpForm() {
-      console.log("点击跳转");
-      this.$u.route("/pages/help-form/help-form");
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.createBox {
-  height: 250px;
-  padding: 40rpx 30rpx;
-  .selectTitle {
-    font-size: 0.8rem;
-    font-weight: bold;
-  }
-  .selectBtns {
-    padding: 20rpx;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    .selectBtn {
-      width: 80rpx;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      text-align: center;
-      .selectBtnIcon {
-        width: 80rpx;
-        height: 80rpx;
-        margin: 0 auto;
-        border-radius: 100%;
-        border: none;
-        background-color: $uni-color-primary;
-      }
-      .selectBtnText {
-        margin-top: 10rpx;
-        color: $uni-text-color-placeholder;
-        font-size: 0.7rem;
-        text-align: center;
-      }
-    }
-  }
-}
-.closeBtnStyle {
-  align-items: center;
-  width: 110rpx;
-  height: 110rpx;
-  margin: 0 auto 40rpx;
-  display: flex;
-  justify-items: center;
-  background: center;
-  background-image: url("https://cdn.uviewui.com/uview/common/min_button_select.png");
-  background-size: 90rpx 90rpx;
-  background-repeat: no-repeat;
-  border-radius: 50%;
-  transform: rotate(45deg);
-  -moz-box-shadow: 0px 0px 1px #e1e1e1;
-  -webkit-box-shadow: 0px 0px 1px #e1e1e1;
-  box-shadow: 0px 0px 1px #e1e1e1;
-}
-</style>
diff --git a/components/c-tabbar-popup/index.vue b/components/c-tabbar-popup/index.vue
index 668499f..c335e08 100644
--- a/components/c-tabbar-popup/index.vue
+++ b/components/c-tabbar-popup/index.vue
@@ -1,91 +1,103 @@
 <template>
-  <view class="createBox">
-    <text class="selectTitle">需求</text>
-    <view class="selectBtns">
-      <view class="selectBtn" v-for="tag in tags" @tap="toHelpForm(tag)">
-        <view class="selectBtnIcon"></view>
-        <text class="selectBtnText">{{ tag.name }}</text>
-      </view>
-    </view>
+	<view class="createBox">
+		<text class="selectTitle">免费帮</text>
+		<view class="selectBtns">
+			<view class="selectBtn" v-for="tag in tags" @tap="toHelpForm(tag)">
+				<view class="selectBtnIcon">
+					<image class="tag-img" :src="tag.img" mode=""></image>
+				</view>
+				<text class="selectBtnText">{{ tag.name }}</text>
+			</view>
+		</view>
 
-    <text class="selectTitle">动态</text>
-    <view class="selectBtns">
-      <view class="selectBtn" v-for="tag in tags" @tap="toHelpForm(tag)">
-        <view class="selectBtnIcon"></view>
-        <text class="selectBtnText">{{ tag.name }}</text>
-      </view>
-    </view>
-  </view>
+
+		<text class="selectTitle">付费帮</text>
+		<view class="selectBtns">
+			<view class="selectBtn" v-for="tag in tags" @tap="toHelpForm(tag)">
+				<view class="selectBtnIcon">
+					<image class="tag-img" :src="tag.img" mode=""></image>
+				</view>
+				<text class="selectBtnText">{{ tag.name }}</text>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import { helpForm } from "../../api";
+	import {
+		helpForm
+	} from "../../api";
 
-export default {
-  name: "c-tabbar-popup",
-  data() {
-    return {
-      msg: "c-tabbar-popup组件\n标题都不写，这不是什么善茬",
-      tags: [], //所有标签
-      tag: "", //点击标签
-    };
-  },
-  methods: {
-    toHelpForm(tag) {
-      this.$u.route("/pages/help-form/help-form", {
-        //参数列表
-        tagId: tag.id,
-      });
-    },
-  },
-  created() {
-    //获取所有标签
-    helpForm.getTags().then((res) => {
-      this.tags = res;
-    });
-  },
-};
+	export default {
+		name: "c-tabbar-popup",
+		data() {
+			return {
+				msg: "c-tabbar-popup组件\n标题都不写，这不是什么善茬",
+				tags: [], //所有标签
+				tag: "", //点标签
+			};
+		},
+		methods: {
+			toHelpForm(tag) {
+				this.$u.route("/pages/help-form/help-form", {
+					//参数列表
+					tagId: tag.id,
+				});
+			},
+		},
+		created() {
+			//获取所有标签
+			helpForm.getTags().then((res) => {
+				this.tags = res.data;
+			});
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.createBox {
-  height: 620rpx;
-  padding: 40rpx 30rpx;
+	.createBox {
+		height: 620rpx;
+		padding: 40rpx 30rpx;
+
+		.selectTitle {
+			font-size: 0.8rem;
+			font-weight: bold;
+		}
 
-  .selectTitle {
-    font-size: 0.8rem;
-    font-weight: bold;
-  }
+		.tag-img {
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 50%;
+		}
 
-  .selectBtns {
-    padding: 20rpx;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
+		.selectBtns {
+			padding: 20rpx;
+			display: flex;
+			flex-direction: row;
+			justify-content: center;
 
-    .selectBtn {
-      width: 80rpx;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      text-align: center;
+			.selectBtn {
+				width: 80rpx;
+				display: flex;
+				flex: 1;
+				flex-direction: column;
+				text-align: center;
 
-      .selectBtnIcon {
-        width: 80rpx;
-        height: 80rpx;
-        margin: 0 auto;
-        border-radius: 100%;
-        border: none;
-        background-color: $uni-color-primary;
-      }
+				.selectBtnIcon {
+					width: 80rpx;
+					height: 80rpx;
+					margin: 0 auto;
+					border-radius: 100%;
+					border: none;
+				}
 
-      .selectBtnText {
-        margin-top: 10rpx;
-        color: $uni-text-color-placeholder;
-        font-size: 0.7rem;
-        text-align: center;
-      }
-    }
-  }
-}
+				.selectBtnText {
+					margin-top: 10rpx;
+					color: $uni-text-color-placeholder;
+					font-size: 0.7rem;
+					text-align: center;
+				}
+			}
+		}
+	}
 </style>
diff --git a/components/c-upload-image/README.md b/components/c-upload-image/README.md
deleted file mode 100644
index bc25f12..0000000
--- a/components/c-upload-image/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# c-upload-image
-作者：王明
-
-Email: 15870290085@163.com
-
-这里是 c-upload-image 组件的基本作用,记得写这个组件是干嘛的。
-
-## 使用方式
-**在 script 中引用组件**
-
-```vue
-import CuploadImage from "@/components/c-upload-image"
-export default {
-    components: { CuploadImage }
-}
-```
-
-**在 template 中使用组件**
-
-```vue
-<c-upload-image></c-upload-image>
-```
-
-# 属性说明
-
-## props
-|属性名 |是否必填 |	类型 |	默认值 |	说明 |
-|-------|---------|--------|-----|-----|
-|无 |否 |	无 |	无 |	无 |
-
-
-# 事件说明
-
-## event
-| 事件名	| 是否必填	| 事件说明 | 返回参数 |
-|-------|---------|--------|--------|
-|无|否|无|无 |
\ No newline at end of file
diff --git a/components/c-upload-image/index.vue b/components/c-upload-image/index.vue
deleted file mode 100644
index 9fbfb29..0000000
--- a/components/c-upload-image/index.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<template>
-  <u-upload action="http://121.5.12.180:80/information/uploadimage" :file-list="fileList" :max-size="2 * 1024 * 1024" max-count="12" @on-success="success" @on-remove="remove" :header="header" @on-error="error" :before-upload="beforeUpload" @on-uploaded="uploaded"></u-upload>
-</template>
-
-<script>
-export default {
-  name: "c-upload-image",
-  props: {
-    value:{
-      type:Array,
-      default:()=>[]
-    }
-  },
-  data() {
-    return {
-      fileList:[],
-      isLoading:false,
-      header:{
-        token:this.$store.state.token
-      }
-    }
-  },
-  methods: {
-    showLoading(){
-      if(!this.isLoading){
-        uni.showLoading({title:"正在上传",mask:true})
-      }
-    },
-    success(res, index, lists) {
-      console.log(res);
-
-
-      /*if(res.success){
-        //uni.showToast({icon:"none",title: "上传成功"});
-        this.value.push(res.fileID)
-      }else {
-        lists[index].error = true;
-      }*/
-
-      uni.hideLoading()
-      this.$emit("input",this.value)
-    },
-    error(data){
-      uni.showToast({icon:"none",title: "上传失败"});
-    },
-    remove(index){
-      this.value.splice(index,1)
-      this.$emit("input",this.value)
-    },
-    beforeUpload(index, list) {
-      if(!this.isLoading){
-        uni.showLoading({title:"正在上传",mask:true})
-      }
-    },
-    uploaded(){
-      uni.hideLoading()
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/manifest.json b/manifest.json
index dce58a5..cb5f387 100644
--- a/manifest.json
+++ b/manifest.json
@@ -51,7 +51,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx4bb4cd8720b860ef",
+        "appid" : "wxdef3d1fee24deb29",
         "setting" : {
             "urlCheck" : false
         },
diff --git a/package.json b/package.json
index abceb4c..31034b8 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,8 @@
     "inquirer": "^7.3.3"
   },
   "dependencies": {
+    "mockjs": "^1.1.0",
     "uni-crazy-router": "0.0.26"
   }
 }
+
diff --git a/pages.json b/pages.json
index edaac3e..93918de 100644
--- a/pages.json
+++ b/pages.json
@@ -4,24 +4,16 @@
     "^c-(.*)": "@/components/c-$1/index.vue"
   },
   "pages": [
-    /*{
-      "path": "pages/test/test",
-      "style": {}
-    },*/{
+    {
       "path": "pages/index/index",
       "style": {}
-    },{
-	  "path": "pages/help-form/help-form",
-	  "style": {}
-	},
-	// #ifdef MP-WEIXIN
-	{
-	  "path": "pages/login/WXLogin",
-	  "style": {}
-	},
-	// #endif
-
-
+    },
+    // #ifdef MP-WEIXIN
+    {
+      "path": "pages/login/WXLogin",
+      "style": {}
+    },
+    // #endif
     {
       "path": "pages/login/login",
       "style": {}
@@ -43,8 +35,14 @@
       "style": {}
     },
     {
+      "path": "pages/help-form/help-form",
+      "style": {}
+    },{
       "path": "pages/help-info/help-info",
       "style": {}
+    },{
+      "path": "pages/test/test",
+      "style": {}
     },
     {
       "path": "pages/setting/setting",
@@ -101,6 +99,10 @@
         "pagePath": "pages/index/index",
         "text": "首页"
       },
+      {
+        "pagePath": "pages/test/test",
+        "text": "创建"
+      },
       {
         "pagePath": "pages/user/Personal-Data",
         "text": "我的"
diff --git a/pages/help-form/help-form.vue b/pages/help-form/help-form.vue
index 4f4b05e..24f4d1b 100644
--- a/pages/help-form/help-form.vue
+++ b/pages/help-form/help-form.vue
@@ -1,89 +1,83 @@
 <template>
   <c-page
-      :title="$t('helpForm.title')"
-      :scrollY="true"
-      backgroundColor="transparent"
+    :title="$t('helpForm.title')"
+    :scrollY="true"
+    backgroundColor="transparent"
   >
     <view class="u-margin-26">
       <u-form :model="form" ref="uForm">
-        <u-form-item prop="title">
-          <u-input
-              v-model="form.informationTitle"
-              type="text"
-              placeholder="请输入标题"
-              :border="true"
-              :clearable="false"
-          />
-        </u-form-item>
         <u-form-item prop="content">
           <u-input
-              v-model="form.informationContent"
-              type="textarea"
-              :placeholder="$t('helpForm.contentPlaceholder')"
-              :border="true"
-              height="200"
-              :maxlength="1000"
-              :clearable="false"
+            v-model="form.content"
+            type="textarea"
+            :placeholder="$t('helpForm.contentPlaceholder')"
+            :border="true"
+            height="200"
           />
         </u-form-item>
-        <c-upload-image v-model="form.images"/>
+        <u-upload
+          ref="uUpload"
+          :action="uploadUrl"
+          :file-list="form.fileList"
+          max-count="4"
+          :uploadText="$t('helpForm.uploadText')"
+        ></u-upload>
         <u-form-item
-            left-icon="map-fill"
-            :label="$t('helpForm.location')"
-            label-width="180rpx"
-            :left-icon-style="leftIcon"
+          left-icon="map-fill"
+          :label="$t('helpForm.location')"
+          label-width="180rpx"
+          :left-icon-style="leftIcon"
         >
           <u-input
-              v-model="form.informationDetailocation"
-              :placeholder="$t('helpForm.chooseLocation')"
-              :clearable="false"
-              @focus="myChooseLocation"
+            v-model="form.locationName"
+            :placeholder="$t('helpForm.chooseLocation')"
+            @tap="myChooseLocation"
           />
         </u-form-item>
         <u-form-item
-            left-icon="rmb-circle-fill"
-            label-width="200rpx"
-            prop="money"
-            :left-icon-style="leftIcon"
-            :label="$t('helpForm.moneyLabel')"
+          left-icon="rmb-circle-fill"
+          label-width="200rpx"
+          prop="money"
+          :left-icon-style="leftIcon"
+          :label="$t('helpForm.moneyLabel')"
         >
           <u-row gutter="12" justify="center">
             <u-col span="10">
               <u-input
-                  v-model="form.informationMoney"
-                  input-align="center"
-                  :placeholder="$t('helpForm.moneyPlaceholder')"
+                v-model="form.money"
+                input-align="center"
+                :placeholder="$t('helpForm.moneyPlaceholder')"
               />
             </u-col>
             <u-col span="2">{{ $t("helpForm.rmb") }}</u-col>
           </u-row>
         </u-form-item>
         <u-form-item
-            left-icon="tags-fill"
-            label-width="150rpx"
-            prop="tag"
-            label-position="top"
-            :left-icon-style="leftIcon"
-            :label="$t('helpForm.chooseTag')"
+          left-icon="tags-fill"
+          label-width="150rpx"
+          prop="tag"
+          label-position="top"
+          :left-icon-style="leftIcon"
+          :label="$t('helpForm.chooseTag')"
         >
           <view class="tagInline">
             <view
-                class="u-margin-left-10 u-margin-top-10 tagView"
-                v-for="(tag, index) in tagArr"
-                :key="index"
+              class="u-margin-left-10 u-margin-top-10 tagView"
+              v-for="(tag, index) in tagArr"
+              :key="index"
             >
-              <!--<c-tag
-                  :text="isEnglish === 'en-US' ? tag.enName : tag.name"
-                  @tap="tagClick(tag, index)"
-                  :type="form.tag === tag.id ? 'primary' : 'default'"
-              ></c-tag>-->
+              <c-tag
+                :text="isEnglish === 'en-US' ? tag.enName : tag.name"
+                @tap="tagClick(tag, index)"
+                :type="form.tag === tag.id ? 'primary' : 'default'"
+              ></c-tag>
             </view>
           </view>
         </u-form-item>
         <view class="submitBtn">
-          <u-button type="primary" @click="submit" shape="circle">{{
-              $t("helpForm.submit")
-            }}</u-button>
+          <u-button type="primary" @tap="submit" shape="circle">{{
+            $t("helpForm.submit")
+          }}</u-button>
         </view>
       </u-form>
     </view>
@@ -92,7 +86,7 @@
 
 <script>
 import CTag from "../../components/c-tag/index";
-import { helpForm } from "../../api";
+import { tags } from "../../api/mock/help-form";
 
 export default {
   name: "help-form.vue",
@@ -102,26 +96,16 @@ export default {
       tagArr: [], //所有分类标签
       isEnglish: this.$i18n.locale, //判断语言是不是英语，判断标签名字
       // 图片上传路径
-      uploadUrl: "http://121.5.12.180:80/information/uploadimage",
+      uploadUrl: "http://www.example.com/upload",
       //表单数据
       form: {
-        informationType: 2,//帮助类型.免费帮:1，付费帮:2，攻略帮;3，商家帮:4
-        informationTitle:"",//标题
-        informationContent: "", //信息内容
-        informationMoney: "", //赏金
-        informationStatus:0,//状态 已接单为1，未接单为0
-        informationUser: "",//用户id
-        informationPlace: "", //信息发布位置
-        informationLatitude: "", //纬度
-        informationLongitude: "", //经度
-        informationStarttime: "",//开始时间
-        informationEndtime: "",//结束时间
-        informationTown: null,//小镇id
-        informationDetailocation:"",//详细地址
-        informationLimitSex: 3,//要求完成者性别：1为男，2为女，3为无限制
-        images: [], //图片路径
-        //        fileList: [], //图片路径
-        //tag: "1", //标签分类
+        content: "", //信息内容
+        money: "", //赏金
+        fileList: [], //图片路径
+        tag: "1", //标签分类
+        locationName: "", //选择地点
+        latitude: "", //纬度
+        longitude: "", //经度
       },
 
       //left-icon样式
@@ -129,20 +113,14 @@ export default {
         color: "#007aff",
       },
       rules: {
-        informationContent: [
+        content: [
           {
             required: true,
             message: "内容不能为空",
             trigger: ["blur"],
           },
-        ],informationTitle: [
-          {
-            required: true,
-            message: "标题不能为空",
-            trigger: ["blur"],
-          },
         ],
-        informationMoney: [
+        money: [
           {
             type: "number",
             message: "请输入数字",
@@ -175,42 +153,39 @@ export default {
       let that = this;
       uni.chooseLocation({
         success: function (res) {
-          that.form.informationLongitude = res.longitude;
-          that.form.informationLatitude = res.latitude;
-          that.form.informationDetailocation = res.informationDetailocation;
-        }
+          that.form.longitude = res.longitude;
+          that.form.latitude = res.latitude;
+          that.form.locationName = res.name;
+        },
       });
     },
     submit() {
-      this.form.informationUser = this.$store.getters.getUserInfo.userId;
-      console.log(this.form);
-      new Promise((resolve, reject) => {
-        this.$refs.uForm.validate(valid => {
-          if (valid) {
-            resolve()
-          } else {
-            reject()
-          }
-        });
-      })
-          .then(()=>{
-            console.log(this.form);
-            return helpForm.addInformation(this.form)
-          })
-          .then(res=>{
-            console.log(res);
-          })
-          .catch(err=>{
-            console.log("err", err);
-          })
+      console.log(
+        "内容" +
+          this.form.content +
+          "\n" +
+          "标签id" +
+          this.form.tag +
+          "\n" +
+          "地点" +
+          this.form.locationName +
+          "\n" +
+          "图片地址" +
+          this.form.fileList.toString() +
+          "\n" +
+          "赏金" +
+          this.form.money +
+          "\n"
+      );
     },
   },
   mounted() {},
   created() {
     //获取所有标签
-    /*tags.getTags().then((res) => {
+    tags.getTags().then((res) => {
+		console.log(res)
       this.tagArr = res;
-    });*/
+    });
   },
   onReady(option) {
     this.$refs.uForm.setRules(this.rules);
diff --git a/pages/login/WXLogin.vue b/pages/login/WXLogin.vue
index 139445c..32c6525 100644
--- a/pages/login/WXLogin.vue
+++ b/pages/login/WXLogin.vue
@@ -19,41 +19,31 @@
 </template>
 
 <script>
-import {login} from "@api"
 export default {
   data() {
     return {
-      toPage: "",
+      toPage: ""
     }
   },
   methods: {
     login({target:{userInfo}}){
-      const form = {}
-      new Promise((resolve, reject) => {
-        form.nickname = userInfo.nickName
-        form.avatarurl = userInfo.avatarUrl
-        form.sex = userInfo.gender
-        form.city = userInfo.city
-        uni.login({
-          provider: 'weixin',
-          success: function (loginRes) {
-            resolve(loginRes.code)
-          },
-          fail(err){
-            reject(err)
-          }
-        });
-      }).then(code=>{
-        form.code = code;
-        return login.WXLogin(form)
-      }).then(({data})=>{
-        uni.showToast({icon:"none",title: '登录成功'});
-        this.$store.commit("setUser",data.data);
-        this.$store.commit("setToken",data.token);
-        this.goTo();
-      }).catch(err=>{
-        uni.showToast({icon:"none",title: '登录失败'});
+      uni.login({
+        provider: 'weixin',
+        success: function (loginRes) {
+          console.log(loginRes.code);
+        }
+      });
+      this.$store.commit("setUserInfo",{
+        id:"",
+        username: "",//用户名
+        email: "",//邮箱
+        gender: userInfo.gender==1?"男":"女",//性别
+        phone: "15870290085",//手机号
+        nickname: userInfo.nickName,//昵称
+        avatar: userInfo.avatarUrl//头像
       })
+      this.$store.commit("setToken","12312312")
+      this.goTo();
     },
     goTo(){
       //前往目标页面
@@ -61,19 +51,15 @@ export default {
       const url = query.url
       delete query.url
       const queryParams = this.$u.queryParams(query)
-      if(queryParams){
-        uni.switchTab({
-          url: "/"+url+queryParams,
-          fail(){
-            uni.redirectTo({
-              url: "/"+url+queryParams,
-              fail(){uni.switchTab({url: "/pages/user/Personal-Data"})}
-            })
-          }
-        })
-      }else {
-        uni.switchTab({url: "/pages/user/Personal-Data"})
-      }
+      uni.switchTab({
+        url: "/"+url+queryParams,
+        fail(){
+          uni.redirectTo({
+            url: "/"+url+queryParams,
+            fail(){uni.redirectTo({url: "/pages/user/Personal-Data"})}
+          })
+        }
+      })
     }
   },
   onLoad(o) {
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index 0975c34..fbe6725 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -79,7 +79,7 @@ export default {
     //手机号替换正则,隐藏4位
     showPhone() {
       let showReg = /^([\s\S]{3})[\s\S]{4}([\s\S]+)$/;
-      return this.$store.state.userinfo.phone?this.$store.state.userinfo.phone.replace(showReg, "$1****$2"):"";
+      return this.$store.state.userinfo.phone.replace(showReg, "$1****$2");
     },
     //获取vuex中当前语言名字
     languageName() {
diff --git a/pages/test/test.vue b/pages/test/test.vue
index c9febf2..1fff407 100644
--- a/pages/test/test.vue
+++ b/pages/test/test.vue
@@ -77,7 +77,6 @@
     >
       <view style="width: 100%; height: 300px; background-color: red"> </view>
     </c-slip-direction>
-    <u-upload :action="action" :file-list="fileList" ></u-upload>
   </c-page>
 </template>
 
@@ -88,13 +87,6 @@ export default {
   data() {
     return {
       theme: 1,
-      // 演示地址，请勿直接使用
-      action: 'http://www.example.com/upload',
-      fileList: [
-        {
-          url: 'http://pics.sc.chinaz.com/files/pic/pic9/201912/hpic1886.jpg',
-        }
-      ]
     };
   },
   methods: {
diff --git a/pages/user/Personal-Data.vue b/pages/user/Personal-Data.vue
index 7ea682c..2fbbc3d 100644
--- a/pages/user/Personal-Data.vue
+++ b/pages/user/Personal-Data.vue
@@ -2,10 +2,10 @@
   <c-page :title="title" ref="page" :scroll-y="true" :tabbar="true">
     <view class="head">
       <view class="head_head">
-        <image class="head_picture" :src="userinfo.avatarurl"></image>
+        <image class="head_picture" :src="userinfo.avatar"></image>
         <view class="head_text">
           <text style="font-size: 20px; color: #000000">{{
-            userinfo.nickname
+            userinfo.nickname.toString()
           }}</text
           ><br />
           <text>{{ form.address }}</text>
@@ -118,8 +118,8 @@ export default {
   },
   computed: {
     userinfo() {
-      console.log(this.$store.state.user);
-      return this.$store.state.user;
+      console.log(this.$store.state.userinfo);
+      return this.$store.state.userinfo;
     },
   },
   methods: {
diff --git a/store/index.js b/store/index.js
index b2d4786..ae19280 100644
--- a/store/index.js
+++ b/store/index.js
@@ -17,7 +17,15 @@ function getLanguage(){
 const store = new Vuex.Store({
     state: {
         token:"",//token
-        user:{},
+        userinfo:{//用户信息
+            id:"",
+            username: "",//用户名
+            gender: "男",//性别
+            email: "",//邮箱
+            phone: "15870290085",//手机号
+            nickname: "",//昵称
+            avatar: ""//头像
+        },
         config:{
             languageList,
             language: getLanguage()
@@ -28,8 +36,8 @@ const store = new Vuex.Store({
         getLanguage(state){
             return state.config.language;
         },
-        getUser(state){
-            return state.user
+        getUserInfo(state){
+            return state.userinfo
         }
 
 
@@ -44,19 +52,29 @@ const store = new Vuex.Store({
 			state.token = token
 			uni.setStorageSync("token",token)
 		},
-		setUser(state, user){
-            state.user = user
+		setUserInfo(state, userinfo){
+			state.userinfo.username = userinfo.username || state.userinfo.username
+			state.userinfo.id = userinfo.id || state.userinfo.id
+			state.userinfo.gender = userinfo.gender || state.userinfo.gender
+			state.userinfo.email = userinfo.email || state.userinfo.email
+			state.userinfo.phone = userinfo.phone || state.userinfo.phone
+			state.userinfo.nickname = userinfo.nickname || state.userinfo.nickname
+			state.userinfo.avatar = userinfo.avatar || state.userinfo.avatar
+            uni.setStorageSync("userinfo",state.userinfo)
 		}
     },
     actions:{
         userInit({ commit }){
+            const userinfo = uni.getStorageSync("userinfo")
             const token = uni.getStorageSync("token")
             const language = uni.getStorageSync("language")
             commit("setLanguage",language)
             commit("setToken",token)
+            commit("setUserInfo",userinfo)
         },
         logout({ commit }){
             commit("setToken","")
+            commit("setUserInfo",{})
         }
     }
 })
diff --git a/uview-ui/components/u-upload/u-upload.vue b/uview-ui/components/u-upload/u-upload.vue
index e2e66f1..2fec19d 100644
--- a/uview-ui/components/u-upload/u-upload.vue
+++ b/uview-ui/components/u-upload/u-upload.vue
@@ -316,7 +316,7 @@ export default {
 					res.tempFiles.map((val, index) => {
 						// 检查文件后缀是否允许，如果不在this.limitType内，就会返回false
 						if(!this.checkFileExt(val)) return ;
-
+						
 						// 如果是非多选，index大于等于1或者超出最大限制数量时，不处理
 						if (!multiple && index >= 1) return;
 						if (val.size > maxSize) {
@@ -413,7 +413,7 @@ export default {
 			this.lists[index].error = false;
 			this.uploading = true;
 			// 创建上传对象
-      const task = uni.uploadFile({
+			const task = uni.uploadFile({
 				url: this.action,
 				filePath: this.lists[index].url,
 				name: this.name,
diff --git a/vue.config.js b/vue.config.js
deleted file mode 100644
index ecb0187..0000000
--- a/vue.config.js
+++ /dev/null
@@ -1,26 +0,0 @@
-
-"use strict";
-const path = require("path");
- 
-function resolve(dir) {
-  return path.join(__dirname, dir);
-}
- 
-const name = "帮帮帮";
- 
-module.exports = {
-  lintOnSave: process.env.NODE_ENV === "development",
-  // 路径别名
-  configureWebpack: {
-    name: name,
-    resolve: {
-      alias: {
-        "@": resolve(""),
-        "@api": resolve("api"),
-        "@c": resolve("components"),
-        "@a": resolve("assets"),
-        "@v": resolve("pages"),
-      },
-    },
-  },
-};
\ No newline at end of file
-- 
Gitee


From d86cdded6896eb4e74bfad4ca0b3d16bd6679075 Mon Sep 17 00:00:00 2001
From: xoipz <1336409817@qq.com>
Date: Thu, 27 May 2021 19:47:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                            |   9 +-
 pages/balance-index/balance-index.vue | 135 +++++++++++-----------
 pages/balance-index/recharge.vue      | 155 ++++++++++++++++++++++++++
 3 files changed, 235 insertions(+), 64 deletions(-)
 create mode 100644 pages/balance-index/recharge.vue

diff --git a/pages.json b/pages.json
index 93918de..b63c59c 100644
--- a/pages.json
+++ b/pages.json
@@ -87,8 +87,13 @@
     {
       "path": "pages/system/404",
       "style": {}
-    }
-  ],
+    },
+	{
+      "path" : "pages/balance-index/recharge",
+      "style" :{}
+            
+        }
+    ],
   "tabBar": {
     "color": "#909399",
     "selectedColor": "#303133",
diff --git a/pages/balance-index/balance-index.vue b/pages/balance-index/balance-index.vue
index 213a744..7a8f3e0 100644
--- a/pages/balance-index/balance-index.vue
+++ b/pages/balance-index/balance-index.vue
@@ -1,69 +1,80 @@
 <template>
-  <c-page ref="page" :title="title">
-	 <view style="width: 100%;">
-    <button class="head-button">
-		<text style="font-size: 35upx; letter-spacing: 10upx; font-weight: 900; ">零钱明细</text>
-	</button>
-	</view>
-	<view class="midle">
-		<u-icon name="rmb-circle-fill" color="yellow" size="280"></u-icon>
-		<br/>
-		<text>我的零钱</text>
-		<br/>
-		<text style="font-size: 80upx;">¥{{form.money}}</text>
-	</view>
-	<view class="end">
-		<u-button type="success" ><text style="font-size: 40upx; font-weight: 500;">充值</text></u-button>
-		<br/>
-		<u-button ><text style="font-size: 40upx; font-weight: 500;">提现</text></u-button>
-	</view>
-  </c-page>
+	<c-page ref="page" :title="title">
+		<view style="width: 100%;">
+			<button class="head-button">
+				<text style="font-size: 35upx; letter-spacing: 10upx; font-weight: 900; ">零钱明细</text>
+			</button>
+		</view>
+		<view class="midle">
+			<u-icon name="rmb-circle-fill" color="yellow" size="280"></u-icon>
+			<br />
+			<text>我的零钱</text>
+			<br />
+			<text style="font-size: 80upx;">¥{{form.money}}</text>
+		</view>
+		<view class="end">
+			<u-button type="success" @click="goPage('/pages/balance-index/recharge')"><text style="font-size: 40upx; font-weight: 500;"
+			>充值</text></u-button>
+			<br />
+			<u-button><text style="font-size: 40upx; font-weight: 500;">提现</text></u-button>
+		</view>
+	</c-page>
 </template>
 
 <script>
-export default {
-  name: "balance-index",
-  data() {
-    return {
-      msg: "balance-index页面",
-	  title: "余额",
-	  form:{
-		  money:'100.10',
-	  }
-    }
-  },
-  methods: {},
-  mounted() {},
-  created() {},
-}
+	export default {
+		name: "balance-index",
+		data() {
+			return {
+				msg: "balance-index页面",
+				title: "余额",
+				form: {
+					money: '100.10',
+				}
+			}
+		},
+		methods: {
+			goPage: function(pagename) {
+				uni.navigateTo({
+				  url: pagename,
+				})
+			}
+		},
+		mounted() {},
+		created() {},
+	}
 </script>
 
 <style lang="scss" scoped>
-.head-button{
-	width: 35%;
-	background-color:transparent;
-	float: right;
-	
-}
-button::after{
-	border: none;
-	border-style: none;
-}
-.midle{
-	width: 60%;
-	text-align: center;
-	font-size: 40upx;
-	position: absolute;
-	top: 170upx;
-	right: 170upx;
-}
-.end{
-	width: 40%;
-	position: absolute;
-	top: 800upx;
-	right: 240upx;
-}
-view > u-button{
-	margin: 0 10upx;
-} 
-</style>
\ No newline at end of file
+	.head-button {
+		width: 35%;
+		background-color: transparent;
+		float: right;
+
+	}
+
+	button::after {
+		border: none;
+		border-style: none;
+	}
+
+	.midle {
+		width: 60%;
+		text-align: center;
+		font-size: 40upx;
+		position: absolute;
+		top: 170upx;
+		right: 170upx;
+	}
+
+	.end {
+		width: 40%;
+		position: absolute;
+		top: 800upx;
+		right: 240upx;
+	}
+
+	view>u-button {
+		margin: 0 10upx;
+	}
+</style>
diff --git a/pages/balance-index/recharge.vue b/pages/balance-index/recharge.vue
new file mode 100644
index 0000000..475bd57
--- /dev/null
+++ b/pages/balance-index/recharge.vue
@@ -0,0 +1,155 @@
+<template>
+	<c-page ref="page" :title="title">
+		<view class="content">
+			<view class="txt1" style="font-size: 34upx; margin-left: 20upx;">充值金额：</view>
+			<view class="input">
+				<view class="i">￥</view>
+				<view style="padding-left: 20upx; flex: 1; background: #ffffff;border-radius: 0 20upx 20upx 0;">
+					<input class="input_in" height="120" placeholder="输入金额" @input="btnopen()" v-model="value"
+						type="number" />
+				</view>
+			</view>
+			<view style="padding: 0 20upx; width: 100%; margin-top: 30upx;">
+				<view :class="btnstyle?'btn_b':'btn_a'" @click="pay()" :style="btnstyle">付款</view>
+			</view>
+		</view>
+	</c-page>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: '充值',
+				user: {
+					money: '100.10',
+				},
+				value: '',
+				btnstyle: false
+			}
+		},
+		methods: {
+			btnopen: function() {
+				if (this.value == '')
+
+					this.btnstyle = false;
+				else
+					this.btnstyle = true;
+			},
+			pay: function() {
+				if (this.value == '')
+					uni.showToast({
+						icon: 'none',
+						title: '请输入金额',
+						duration: 2000
+					});
+				else {
+
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+	.page {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.txt1 {
+		font-size: 40upx;
+		margin: 4upx 10upx;
+		font-weight: bold;
+		z-index: 2;
+	}
+
+	.content {
+		width: 100%;
+		height: 600upx;
+		padding-top: 30upx;
+		background: #f3f4f6;
+		border-radius: 30upx;
+		z-index: 3;
+		border-radius: 20upx;
+	}
+
+	.input {
+		margin-top: 30upx;
+		width: 100%;
+		height: 120upx;
+		padding: 0 20upx;
+		line-height: 120upx;
+		display: flex;
+		font-weight: bold;
+	}
+
+	.input_in {
+		width: 100%;
+		height: 100%;
+		background: #ffffff;
+		border-radius: 0 20upx 20upx 0;
+		font-size: 50upx;
+		font-weight: 500;
+	}
+
+	.i {
+		font-size: 60upx;
+		background: #ffffff;
+		border-radius: 20upx 0 0 20upx;
+		padding: 0 10upx;
+		padding-left: 20upx;
+	}
+
+	.btn_a {
+		width: 100%;
+		height: 100upx;
+		border-radius: 10upx;
+		font-size: 40upx;
+		text-align: center;
+		line-height: 100upx;
+		margin-top: 14upx;
+		background: #a6caf0;
+		color: #fff;
+		box-shadow: 0 2upx 10upx 0 rgba(0, 0, 0, 0.2);
+		transition: all 0.2s;
+	}
+
+	.btn_a:active {
+		background: #bfd5f0;
+		transition: all 0.2s;
+	}
+
+	.btn_b {
+		width: 100%;
+		height: 100upx;
+		border-radius: 10upx;
+		font-size: 40upx;
+		text-align: center;
+		line-height: 100upx;
+		margin-top: 14upx;
+		background: #4fadff;
+		color: #fff;
+		box-shadow: 0 2upx 10upx 0 rgba(0, 0, 0, 0.2);
+		transition: all 0.2s;
+	}
+
+	.btn_b {
+		width: 100%;
+		height: 100upx;
+		border-radius: 10upx;
+		font-size: 40upx;
+		text-align: center;
+		line-height: 100upx;
+		margin-top: 14upx;
+		background: #4fadff;
+		color: #fff;
+		box-shadow: 0 2upx 10upx 0 rgba(0, 0, 0, 0.2);
+		transition: all 0.2s;
+	}
+
+	.btn_b:active {
+		background: #3798ff;
+		transition: all 0.2s;
+	}
+</style>
-- 
Gitee


From ac75192de95f64d8336eee365757c054c1b3befd Mon Sep 17 00:00:00 2001
From: xoipz <1336409817@qq.com>
Date: Thu, 27 May 2021 22:36:48 +0800
Subject: [PATCH 3/3] 1

---
 pages/balance-index/recharge.vue | 181 +++++++++++++++++++++++++------
 1 file changed, 146 insertions(+), 35 deletions(-)

diff --git a/pages/balance-index/recharge.vue b/pages/balance-index/recharge.vue
index 475bd57..ca0fae1 100644
--- a/pages/balance-index/recharge.vue
+++ b/pages/balance-index/recharge.vue
@@ -1,18 +1,38 @@
 <template>
 	<c-page ref="page" :title="title">
+		<view class="box">
+			<view class="user_money">账户金额：<text style="color: #55aaff;margin-right: 10upx;">123.00</text>元</view>
+		</view>
 		<view class="content">
-			<view class="txt1" style="font-size: 34upx; margin-left: 20upx;">充值金额：</view>
-			<view class="input">
-				<view class="i">￥</view>
-				<view style="padding-left: 20upx; flex: 1; background: #ffffff;border-radius: 0 20upx 20upx 0;">
-					<input class="input_in" height="120" placeholder="输入金额" @input="btnopen()" v-model="value"
-						type="number" />
+			<view class="allbox">
+				<view :class="item!=index?'cobox' :'cobox_a'" v-for="item in [0,1,2]" @click="choosebox(item)">
+					<view class=" co_txt">
+						{{moneys[item]}}
+					</view>
+				</view>
+			</view>
+
+			<view class="allbox">
+				<view :class="item!=index?'cobox' :'cobox_a'" v-for="item in [3,4,5]" @click="choosebox(item)">
+					<view class=" co_txt">
+						{{moneys[item]}}
+					</view>
 				</view>
 			</view>
-			<view style="padding: 0 20upx; width: 100%; margin-top: 30upx;">
-				<view :class="btnstyle?'btn_b':'btn_a'" @click="pay()" :style="btnstyle">付款</view>
+		</view>
+
+		<view class="input" :style="index==5?'height:120upx;':'height:0upx;'">
+			<view class="i">￥</view>
+			<view style="padding-left: 20upx; flex: 1; background: #ffffff;border-radius: 0 20upx 20upx 0;">
+				<input class="input_in" height="120" placeholder="输入金额" @input="btnopen()" v-model="value"
+					type="number" />
 			</view>
 		</view>
+
+		<view style="padding: 0 20upx; width: 100%; margin-top: 30upx; transition: all 0.3s;"
+			:style="index==5?'margin-top:30upx;':'margin-top:0upx;'">
+			<view :class="btnstyle||(index!=-1&&index!=5)?'btn_b':'btn_a'" @click="pay()" :style="btnstyle">付款</view>
+		</view>
 	</c-page>
 </template>
 
@@ -20,12 +40,11 @@
 	export default {
 		data() {
 			return {
+				index: -1,
 				title: '充值',
-				user: {
-					money: '100.10',
-				},
 				value: '',
-				btnstyle: false
+				btnstyle: false,
+				moneys: ['￥20', '￥30', '￥45', '￥45', '￥45', '其他']
 			}
 		},
 		methods: {
@@ -37,15 +56,24 @@
 					this.btnstyle = true;
 			},
 			pay: function() {
-				if (this.value == '')
+				if (this.value == '' && this.index == 5)
 					uni.showToast({
 						icon: 'none',
 						title: '请输入金额',
 						duration: 2000
 					});
 				else {
-
+					uni.showToast({
+						icon: 'none',
+						title:  this.moneys[this.index],
+						duration: 2000
+					});
 				}
+				
+			},
+			choosebox: function(box) {
+				this.index = box;
+				this.value = '';
 			}
 		}
 	}
@@ -57,31 +85,116 @@
 		flex-direction: column;
 	}
 
-	.txt1 {
+	.box {
+		display: flex;
+		background: #ffffff;
+		margin-top: 10upx;
+	}
+
+	.user_money {
+		font-size: 36upx;
+		height: 100upx;
+		line-height: 100upx;
+		background: #fff;
+		padding-left: 20upx;
+	}
+
+	.txt {
 		font-size: 40upx;
-		margin: 4upx 10upx;
 		font-weight: bold;
-		z-index: 2;
+		height: 80upx;
+		line-height: 80upx;
+		background: #fff;
+	}
+
+	.br {
+		width: 100%;
+		height: 4upx;
+		background: #ebebeb;
 	}
 
 	.content {
 		width: 100%;
-		height: 600upx;
-		padding-top: 30upx;
-		background: #f3f4f6;
-		border-radius: 30upx;
-		z-index: 3;
-		border-radius: 20upx;
+		height: auto;
+		padding: 30upx 0;
+		background: #ffffff;
+		margin-top: 20upx;
 	}
 
-	.input {
-		margin-top: 30upx;
+	.allbox {
 		width: 100%;
+		padding: 20upx 10upx;
+		background: #ffffff;
+		display: flex;
+	}
+
+	.cobox {
+		flex: 1;
+		height: 120upx;
+		margin: 0 10upx;
+		background: #ffffff;
+		border: 4upx #e0ecf1 solid;
+		border-radius: 10upx;
+		display: flex;
+		flex-direction: column;
+		transition: all 0.3s;
+	}
+
+	.cobox_a {
+		flex: 1;
+		position: relative;
 		height: 120upx;
+		margin: 0 10upx;
+		background: #f3fcfe;
+		border: 4upx #A8E1FE solid;
+		border-radius: 10upx;
+		display: flex;
+		flex-direction: column;
+		transition: all 0.3s;
+		overflow: hidden;
+		animation: opb 0.3s;
+	}
+
+	.cobox_a::before {
+		animation: opa 0.3s;
+		content: '';
+		display: block;
+		position: absolute;
+		width: 40upx;
+		height: 100upx;
+		background: #A8E1FE;
+		top: -60upx;
+		right: -10upx;
+		transform: rotate(135deg);
+		opacity: 0%;
+	}
+
+	@keyframes opa {
+		from {
+			opacity: 0;
+		}
+
+		to {
+			opacity: 1;
+		}
+	}
+
+	.co_txt {
+		font-size: 40upx;
+		text-align: center;
+		line-height: 116upx;
+	}
+
+	.input {
+		margin-top: 20upx;
+		width: 100%;
+		height: 0;
 		padding: 0 20upx;
 		line-height: 120upx;
 		display: flex;
 		font-weight: bold;
+		overflow: hidden;
+		transition: all 0.3s;
 	}
 
 	.input_in {
@@ -108,15 +221,14 @@
 		font-size: 40upx;
 		text-align: center;
 		line-height: 100upx;
-		margin-top: 14upx;
-		background: #a6caf0;
+		margin-top: 0upx;
+		background: #a8e1fe;
 		color: #fff;
-		box-shadow: 0 2upx 10upx 0 rgba(0, 0, 0, 0.2);
 		transition: all 0.2s;
 	}
 
 	.btn_a:active {
-		background: #bfd5f0;
+		background: #c1ebfe;
 		transition: all 0.2s;
 	}
 
@@ -127,10 +239,9 @@
 		font-size: 40upx;
 		text-align: center;
 		line-height: 100upx;
-		margin-top: 14upx;
+		margin-top: 0upx;
 		background: #4fadff;
 		color: #fff;
-		box-shadow: 0 2upx 10upx 0 rgba(0, 0, 0, 0.2);
 		transition: all 0.2s;
 	}
 
@@ -141,15 +252,15 @@
 		font-size: 40upx;
 		text-align: center;
 		line-height: 100upx;
-		margin-top: 14upx;
-		background: #4fadff;
+		margin-top: 0upx;
+		background: #50b9ff;
 		color: #fff;
-		box-shadow: 0 2upx 10upx 0 rgba(0, 0, 0, 0.2);
 		transition: all 0.2s;
 	}
 
 	.btn_b:active {
-		background: #3798ff;
+		background: #4fadff;
+
 		transition: all 0.2s;
 	}
 </style>
-- 
Gitee