From da8373e2cb8d834597b3ce2909697a891b1de398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=98=8E?= <15870290085@163.com>
Date: Sat, 16 Jan 2021 14:05:29 +0800
Subject: [PATCH] init

---
 api/index.js                              |   5 +
 api/request.js                            |  11 +-
 assets/languages/Chinese.json             |   4 -
 assets/languages/English.json             |   4 -
 components/c-page/index.vue               |   2 +-
 manifest.json                             |   2 +-
 package.json                              |   1 -
 pages.json                                |  31 ++--
 pages/help-form/help-form.vue             | 188 ++++++++++++----------
 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 +-
 15 files changed, 199 insertions(+), 165 deletions(-)

diff --git a/api/index.js b/api/index.js
index 0a668eb..6084708 100644
--- a/api/index.js
+++ b/api/index.js
@@ -11,5 +11,10 @@ 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/request.js b/api/request.js
index 46aabf2..6a7cafb 100644
--- a/api/request.js
+++ b/api/request.js
@@ -1,7 +1,9 @@
 import uni_request from './requestAxios.js'
+import Vue from "vue"
+import store from "../store"
 
 const request = uni_request({ // 有效配置项只有三个
-    baseURL: 'http://120.24.151.246:80', //baseURL
+    baseURL: 'http://121.5.12.180: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。即可实现无痛刷新。
@@ -12,13 +14,18 @@ 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))
-    if (res.code === 200) {
+    console.log(response);
+    if (res.token) {
+        store.commit("setToken",res.token)
+    }
+    if (res.state === 200) {
         //console.log('响应拦截器， 会阻塞 3 s')
     }
     return response
diff --git a/assets/languages/Chinese.json b/assets/languages/Chinese.json
index 1f61aeb..a28f3da 100644
--- a/assets/languages/Chinese.json
+++ b/assets/languages/Chinese.json
@@ -64,9 +64,5 @@
     "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 92beb6e..323c9c6 100644
--- a/assets/languages/English.json
+++ b/assets/languages/English.json
@@ -63,9 +63,5 @@
     "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 2f7a551..c2a6eab 100644
--- a/components/c-page/index.vue
+++ b/components/c-page/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <view :class="['page','blackTheme']">
+  <view :class="['page']">
     <!--导航栏-->
     <c-navbar :back-text="$t('page.back')"
               title-color="#fff"
diff --git a/manifest.json b/manifest.json
index cb5f387..dce58a5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -51,7 +51,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxdef3d1fee24deb29",
+        "appid" : "wx4bb4cd8720b860ef",
         "setting" : {
             "urlCheck" : false
         },
diff --git a/package.json b/package.json
index d293f61..abceb4c 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,6 @@
     "inquirer": "^7.3.3"
   },
   "dependencies": {
-    "mockjs": "^1.1.0",
     "uni-crazy-router": "0.0.26"
   }
 }
diff --git a/pages.json b/pages.json
index ab8e0da..edaac3e 100644
--- a/pages.json
+++ b/pages.json
@@ -4,16 +4,24 @@
     "^c-(.*)": "@/components/c-$1/index.vue"
   },
   "pages": [
-    {
-      "path": "pages/index/index",
+    /*{
+      "path": "pages/test/test",
       "style": {}
-    },
-    // #ifdef MP-WEIXIN
-    {
-      "path": "pages/login/WXLogin",
+    },*/{
+      "path": "pages/index/index",
       "style": {}
-    },
-    // #endif
+    },{
+	  "path": "pages/help-form/help-form",
+	  "style": {}
+	},
+	// #ifdef MP-WEIXIN
+	{
+	  "path": "pages/login/WXLogin",
+	  "style": {}
+	},
+	// #endif
+
+
     {
       "path": "pages/login/login",
       "style": {}
@@ -35,9 +43,6 @@
       "style": {}
     },
     {
-      "path": "pages/help-form/help-form",
-      "style": {}
-    },{
       "path": "pages/help-info/help-info",
       "style": {}
     },
@@ -96,10 +101,6 @@
         "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 404c80c..4f4b05e 100644
--- a/pages/help-form/help-form.vue
+++ b/pages/help-form/help-form.vue
@@ -1,83 +1,89 @@
 <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.content"
-            type="textarea"
-            :placeholder="$t('helpForm.contentPlaceholder')"
-            :border="true"
-            height="200"
+              v-model="form.informationContent"
+              type="textarea"
+              :placeholder="$t('helpForm.contentPlaceholder')"
+              :border="true"
+              height="200"
+              :maxlength="1000"
+              :clearable="false"
           />
         </u-form-item>
-        <u-upload
-          ref="uUpload"
-          :action="uploadUrl"
-          :file-list="form.fileList"
-          max-count="4"
-          :uploadText="$t('helpForm.uploadText')"
-        ></u-upload>
+        <c-upload-image v-model="form.images"/>
         <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.locationName"
-            :placeholder="$t('helpForm.chooseLocation')"
-            @tap="myChooseLocation"
+              v-model="form.informationDetailocation"
+              :placeholder="$t('helpForm.chooseLocation')"
+              :clearable="false"
+              @focus="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.money"
-                input-align="center"
-                :placeholder="$t('helpForm.moneyPlaceholder')"
+                  v-model="form.informationMoney"
+                  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" @tap="submit" shape="circle">{{
-            $t("helpForm.submit")
-          }}</u-button>
+          <u-button type="primary" @click="submit" shape="circle">{{
+              $t("helpForm.submit")
+            }}</u-button>
         </view>
       </u-form>
     </view>
@@ -86,7 +92,7 @@
 
 <script>
 import CTag from "../../components/c-tag/index";
-import { tags } from "../../api/mock/help-form";
+import { helpForm } from "../../api";
 
 export default {
   name: "help-form.vue",
@@ -96,16 +102,26 @@ export default {
       tagArr: [], //所有分类标签
       isEnglish: this.$i18n.locale, //判断语言是不是英语，判断标签名字
       // 图片上传路径
-      uploadUrl: "http://www.example.com/upload",
+      uploadUrl: "http://121.5.12.180:80/information/uploadimage",
       //表单数据
       form: {
-        content: "", //信息内容
-        money: "", //赏金
-        fileList: [], //图片路径
-        tag: "1", //标签分类
-        locationName: "", //选择地点
-        latitude: "", //纬度
-        longitude: "", //经度
+        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", //标签分类
       },
 
       //left-icon样式
@@ -113,14 +129,20 @@ export default {
         color: "#007aff",
       },
       rules: {
-        content: [
+        informationContent: [
           {
             required: true,
             message: "内容不能为空",
             trigger: ["blur"],
           },
+        ],informationTitle: [
+          {
+            required: true,
+            message: "标题不能为空",
+            trigger: ["blur"],
+          },
         ],
-        money: [
+        informationMoney: [
           {
             type: "number",
             message: "请输入数字",
@@ -153,38 +175,42 @@ export default {
       let that = this;
       uni.chooseLocation({
         success: function (res) {
-          that.form.longitude = res.longitude;
-          that.form.latitude = res.latitude;
-          that.form.locationName = res.name;
-        },
+          that.form.informationLongitude = res.longitude;
+          that.form.informationLatitude = res.latitude;
+          that.form.informationDetailocation = res.informationDetailocation;
+        }
       });
     },
     submit() {
-      console.log(
-        "内容" +
-          this.form.content +
-          "\n" +
-          "标签id" +
-          this.form.tag +
-          "\n" +
-          "地点" +
-          this.form.locationName +
-          "\n" +
-          "图片地址" +
-          this.form.fileList.toString() +
-          "\n" +
-          "赏金" +
-          this.form.money +
-          "\n"
-      );
+      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);
+          })
     },
   },
   mounted() {},
   created() {
     //获取所有标签
-    tags.getTags().then((res) => {
+    /*tags.getTags().then((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 32c6525..139445c 100644
--- a/pages/login/WXLogin.vue
+++ b/pages/login/WXLogin.vue
@@ -19,31 +19,41 @@
 </template>
 
 <script>
+import {login} from "@api"
 export default {
   data() {
     return {
-      toPage: ""
+      toPage: "",
     }
   },
   methods: {
     login({target:{userInfo}}){
-      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//头像
+      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: '登录失败'});
       })
-      this.$store.commit("setToken","12312312")
-      this.goTo();
     },
     goTo(){
       //前往目标页面
@@ -51,15 +61,19 @@ export default {
       const url = query.url
       delete query.url
       const queryParams = this.$u.queryParams(query)
-      uni.switchTab({
-        url: "/"+url+queryParams,
-        fail(){
-          uni.redirectTo({
-            url: "/"+url+queryParams,
-            fail(){uni.redirectTo({url: "/pages/user/Personal-Data"})}
-          })
-        }
-      })
+      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"})
+      }
     }
   },
   onLoad(o) {
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index fbe6725..0975c34 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.replace(showReg, "$1****$2");
+      return this.$store.state.userinfo.phone?this.$store.state.userinfo.phone.replace(showReg, "$1****$2"):"";
     },
     //获取vuex中当前语言名字
     languageName() {
diff --git a/pages/test/test.vue b/pages/test/test.vue
index 1fff407..c9febf2 100644
--- a/pages/test/test.vue
+++ b/pages/test/test.vue
@@ -77,6 +77,7 @@
     >
       <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>
 
@@ -87,6 +88,13 @@ 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 2fbbc3d..7ea682c 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.avatar"></image>
+        <image class="head_picture" :src="userinfo.avatarurl"></image>
         <view class="head_text">
           <text style="font-size: 20px; color: #000000">{{
-            userinfo.nickname.toString()
+            userinfo.nickname
           }}</text
           ><br />
           <text>{{ form.address }}</text>
@@ -118,8 +118,8 @@ export default {
   },
   computed: {
     userinfo() {
-      console.log(this.$store.state.userinfo);
-      return this.$store.state.userinfo;
+      console.log(this.$store.state.user);
+      return this.$store.state.user;
     },
   },
   methods: {
diff --git a/store/index.js b/store/index.js
index ae19280..b2d4786 100644
--- a/store/index.js
+++ b/store/index.js
@@ -17,15 +17,7 @@ function getLanguage(){
 const store = new Vuex.Store({
     state: {
         token:"",//token
-        userinfo:{//用户信息
-            id:"",
-            username: "",//用户名
-            gender: "男",//性别
-            email: "",//邮箱
-            phone: "15870290085",//手机号
-            nickname: "",//昵称
-            avatar: ""//头像
-        },
+        user:{},
         config:{
             languageList,
             language: getLanguage()
@@ -36,8 +28,8 @@ const store = new Vuex.Store({
         getLanguage(state){
             return state.config.language;
         },
-        getUserInfo(state){
-            return state.userinfo
+        getUser(state){
+            return state.user
         }
 
 
@@ -52,29 +44,19 @@ const store = new Vuex.Store({
 			state.token = token
 			uni.setStorageSync("token",token)
 		},
-		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)
+		setUser(state, user){
+            state.user = user
 		}
     },
     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 2fec19d..e2e66f1 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,
-- 
Gitee