Merge branch 'dev_lqs' into 'master'

Dev lqs

See merge request !21

H5/.env

+VUE_APP_BASE_URL = "http://8.131.244.76:81/"
\ No newline at end of file

H5/src/api/base.js

@@ -17,15 +17,15 @@ export function smsCode(params) {
 }
 
 /**
- * 上传图片 后端还在修改 TODO
+ * 上传图片 后端还在修改
  * @param {*} params files 文件
- * @param {*} params userId 用户id
+ * @param {*} params  邀请码
  */
 
-export function uploadImage(userId, file) {
+export function uploadImage(params, file) {
   return request({
     url: "/ZX/uploadImage",
     method: "post",
     data: file
-  })
+  });
 }

H5/src/api/customer.js

+import request from "@/utils/request";
+
+/**
+ * 获取专属客服
+ */
+export function getCustomer() {
+	return request({
+		url: "/customerService/service",
+		method: "get"
+	})
+}
\ No newline at end of file

H5/src/api/myStatus.js

@@ -2,27 +2,27 @@ import request from "@/utils/request";
 
 /**
  * 我的直推
- * @param {*} params userId 
- * @returns 
+ * @param {*} params userId
+ * @returns
  */
 export function recomendInfo(params) {
-	return request({
-		url: "/user/myRecommend",
-		method: "get",
-		params
-	})
+  return request({
+    url: "/user/myRecommend",
+    method: "get",
+    params
+  });
 }
 
 /**
  * 获取我的直推详情
  * @param {*} param  userId *   string
  * @param {*} param userlevel * int 等级
- * @returns 
+ * @returns
  */
 export function recommendDetail(params) {
-	return request({
-		url: "/user/myRecommendInfo",
-		method: "get",
-		params
-	})
+  return request({
+    url: "/user/myRecommendInfo",
+    method: "get",
+    params
+  });
 }

H5/src/api/reward.js

@@ -3,12 +3,12 @@ import request from "@/utils/request";
 /**
  * 本月累计奖金
  * @param {*} params userId
- * @returns 
+ * @returns
  */
 export function monthRewards(params) {
-	return request({
-		url: "award/queryMonthAward",
-		method: "get",
-		params
-	})
-}
\ No newline at end of file
+  return request({
+    url: "award/queryMonthAward",
+    method: "get",
+    params
+  });
+}

H5/src/api/user.js

@@ -8,7 +8,7 @@ export function Login() {
   });
 }
 /**
- * 发送验证码 
+ * 发送验证码
  * @param {*} params userId  required 手机号
  * @param {*} param sms required 验证码
  * @param {*} param beInvitedCode required 邀请码
@@ -27,21 +27,21 @@ export function register(params) {
  * 填写邀请码
  * @param {*} params inviteCode
  * @param {*} params userId
- * @returns 
+ * @returns
  */
 export function fillInviteCode(params) {
   return request({
     url: "/user/fillInInviteCode",
     method: "post",
     params
-  })
+  });
 }
 
 /**
  * 设置头像
  * @param {*} param headImage 头像url
- * @param {*} param userId  
- * @returns 
+ * @param {*} param userId
+ * @returns
  */
 
 export function setAvatar(params) {
@@ -49,6 +49,18 @@ export function setAvatar(params) {
     url: "/user/setHeadImage",
     method: "post",
     params
-  })
+  });
 }
 
+/**
+ * 退出
+ * @param {*} token 
+ * @returns 
+ */
+export function logout(token) {
+  return request({
+    url: "/api/user/logout",
+    method: "post",
+    header: { "token":  token}
+  })
+}
\ No newline at end of file

H5/src/utils/bridgeToAppFun.js

@@ -14,3 +14,8 @@ export function getAuthToken() {
     });
   });
 }
+
+// 退出
+export function logoutToApp() {
+  jsBridge.callhandler("logout");
+}

H5/src/views/customer-service.vue

@@ -12,7 +12,7 @@
     <div class="panel-box">
       <div class="panel-content">
         <div class="title">客服二维码</div>
-        <img src="@/assets/images/logo.png" class="qrCode" alt="" />
+        <img :src="imageUrl" class="qrCode" alt="" />
         <div class="save-code">
           <p>保存二维码</p>
           <p>打开微信扫一扫添加客服</p>
@@ -24,17 +24,29 @@
 </template>
 
 <script>
-// var userId = 13100911369
+import { getCustomer } from "@/api/customer";
 
 export default {
   name: "customerService",
   data() {
-    return {};
+    return {
+      imageUrl: ""
+    };
+  },
+  created() {
+    this.getCustomerData();
   },
   mounted() {},
   methods: {
     handleUrl(urlName) {
       this.$router.push({ name: urlName });
+    },
+    getCustomerData() {
+      getCustomer().then(res => {
+        if (res.code === 0) {
+          this.imageUrl = process.env.VUE_APP_BASE_URL + res.data
+        }
+      })
     }
   }
 };
@@ -98,6 +110,7 @@ $white: #ffffff;
         display: block;
       }
       .save-code {
+        text-align: center;
         font-size: 14px;
         font-weight: normal;
         font-stretch: normal;

H5/src/views/modefyAvatar.vue

@@ -2,7 +2,9 @@
   <div class="modefy-avatar">
     <img class="avatar" :src="avatar" alt />
     <div class="btn">
-      <van-button type="primary" plain style="height:44px">确定</van-button>
+      <van-button type="primary" plain style="height:44px" @click="checkBtn"
+        >确定</van-button
+      >
       <van-uploader
         :max-count="1"
         :before-delete="onDeleteAvatar"
@@ -16,11 +18,13 @@
 
 <script>
 import { setAvatar } from "@/api/user";
+import { uploadImage } from "@/api/base";
 export default {
   name: "ModefyAvatar",
   data() {
     return {
-      avatar: ""
+      avatar: "",
+      imageUrl: ""
     };
   },
   mounted() {
@@ -29,14 +33,30 @@ export default {
     }
   },
   methods: {
+    checkBtn() {
+      const params = {
+        headImage: this.imageUrl,
+        userId: "18757121665"
+      };
+      setAvatar(params).then(res => {
+        if (res.code === 0) {
+          this.$toast.success("头像设置成功");
+          this.$router.go(-1);
+        }
+      });
+    },
     onRead(file) {
       this.avatar = file.content;
       console.log("file", file);
       const params = {
-        headImage: '',
-        userId: "18757121665"
-      }
-      setAvatar(params).then()
+        inviteCode: "bbbbbb"
+      };
+      const fd = new FormData();
+      fd.append("files", file.file);
+      uploadImage(params, fd).then(res => {
+        console.log(res);
+        this.imageUrl = res.zxUrl;
+      });
     },
     onDeleteAvatar(file, detail) {
       return new Promise((resolve, reject) => {

H5/src/views/my/components/invitee.vue

@@ -31,8 +31,8 @@ export default {
       default: () => {}
     }
   },
-  data() {},
-}
+  data() {}
+};
 </script>
 
 <style lang="scss" scoped>

H5/src/views/my/myStatus.vue

@@ -3,7 +3,10 @@
     <div class="userInfo">
       <img src="@/assets/images/白银树.png" alt="等级背景图" />
       <span class="level-label">我的等级</span>
-      <span class="level">Lv.{{ userRecommendInfo.userlevel }}{{ userRecommendInfo.userlevel | userLevel }}</span>
+      <span class="level"
+        >Lv.{{ userRecommendInfo.userlevel
+        }}{{ userRecommendInfo.userlevel | userLevel }}</span
+      >
       <div class="userAvatar">
         <div class="avatar-box">
           <img class="avatar" src="@/assets/images/avatar.png" alt="头像" />
@@ -13,11 +16,17 @@
       </div>
     </div>
     <div class="status">
-      <van-tabs v-model="activeTab" swipeable sticky color="#28b537" @click="changeTab">
+      <van-tabs
+        v-model="activeTab"
+        swipeable
+        sticky
+        color="#28b537"
+        @click="changeTab"
+      >
         <van-tab
           v-for="item in Tabs"
           :key="`tba-${item.id}`"
-          :title="`${ item.name }(${ item.num})`"
+          :title="`${item.name}(${item.num})`"
         >
           <base-refresh-scroll @downLoad="onDownLoad" @upRefresh="onUpRefresh">
             <div slot="content">
@@ -47,31 +56,31 @@ export default {
       let levelName = "";
       switch (key) {
         case 0:
-          levelName = "普通用户"
+          levelName = "普通用户";
           break;
         case 1:
-          levelName = "幼苗"
+          levelName = "幼苗";
           break;
         case 2:
-          levelName = "青铜树"
+          levelName = "青铜树";
           break;
         case 3:
-          levelName = "白银树"
+          levelName = "白银树";
           break;
         case 4:
-          levelName = "黄金树"
+          levelName = "黄金树";
           break;
         case 5:
-          levelName = "农场主"
+          levelName = "农场主";
           break;
         case 6:
-          levelName = "森林之星"
+          levelName = "森林之星";
           break;
         case 7:
-          levelName = "西田森合伙人"
+          levelName = "西田森合伙人";
           break;
         default:
-          levelName = ""
+          levelName = "";
           break;
       }
       return levelName;
@@ -135,8 +144,8 @@ export default {
     };
   },
   created() {
-    this.getRecommendInfo()
-    this.getRecommendDetail(0)
+    this.getRecommendInfo();
+    this.getRecommendDetail(0);
   },
   methods: {
     changeTab(name) {
@@ -151,31 +160,31 @@ export default {
     getRecommendInfo() {
       const params = {
         userId: "13933770749"
-      }
+      };
       recomendInfo(params).then(res => {
         if (res.code === 0) {
-          this.userRecommendInfo = res.data
-          for(const key in res.data.myRecommed) {
+          this.userRecommendInfo = res.data;
+          for (const key in res.data.myRecommed) {
             this.Tabs.forEach(el => {
               if (el.keyName === key) {
                 console.log(key);
-                el.num = res.data.myRecommed[key]
+                el.num = res.data.myRecommed[key];
               }
             });
           }
         }
-      })
+      });
     },
     getRecommendDetail(level) {
       const params = {
         userid: "13933770749",
         userlevel: level
-      }
+      };
       recommendDetail(params).then(res => {
         if (res.code === 0) {
           this.inviteeArr = res.data;
         }
-      })
+      });
     }
   }
 };

H5/src/views/rewards/month-award.vue

@@ -24,9 +24,7 @@
           :autoplay="3000"
           :show-indicators="false"
         >
-          <van-swipe-item>
-            {{ awardInfo.awardTime }}</van-swipe-item
-          >
+          <van-swipe-item> {{ awardInfo.awardTime }}</van-swipe-item>
           <van-swipe-item>内容 2</van-swipe-item>
           <van-swipe-item>内容 3</van-swipe-item>
         </van-swipe>
@@ -34,8 +32,15 @@
     </div>
     <div class="content">
       <p style="font-size: 16px; font-weight: bold">本月累计奖金</p>
-      <countTo :startVal='awardInfo.lastToatal' :endVal='awardInfo.monthAwardTotal' :duration='3000' style="font-weight: bold"></countTo>
-      <p style="font-size: 14px;color:#333333">历史累计奖金：￥{{ awardInfo.awardTotal.toFixed(2) || 0 }}</p>
+      <countTo
+        :startVal="awardInfo.lastToatal"
+        :endVal="awardInfo.monthAwardTotal"
+        :duration="3000"
+        style="font-weight: bold"
+      ></countTo>
+      <p style="font-size: 14px;color:#333333">
+        历史累计奖金：￥{{ awardInfo.awardTotal.toFixed(2) || 0 }}
+      </p>
     </div>
     <div class="newAdd-my">
       <div class="newAdd">
@@ -75,9 +80,8 @@
   </div>
 </template>
 
-
 <script>
-import countTo from 'vue-count-to';
+import countTo from "vue-count-to";
 import { monthRewards } from "@/api/reward";
 export default {
   name: "MonthAward",
@@ -88,27 +92,28 @@ export default {
         goldAward: 0,
         farmerAward: 0,
         forestStartAward: 0,
-        partnerAward: 0,
+        partnerAward: 0
       }
-    }
+    };
   },
   created() {
-    this.getData()
+    this.getData();
   },
   methods: {
     getData() {
       const params = {
         userId: "18757121665"
-      }
+      };
       monthRewards(params).then(res => {
         if (res.code === 0) {
-          this.awardInfo = res.data
-          this.awardInfo.lastToatal = res.data.monthAwardTotal - res.data.growthAward
+          this.awardInfo = res.data;
+          this.awardInfo.lastToatal =
+            res.data.monthAwardTotal - res.data.growthAward;
         }
-      })
+      });
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>

H5/src/views/router.vue

@@ -38,9 +38,6 @@ export default {
         }
       }
     });
-    this.routes.forEach(el => {
-      console.log(el.meta.title + " " + "http://8.131.244.76:81/front" + el.path);
-    })
   },
   methods: {
     to(path) {

H5/src/views/settings.vue

@@ -20,7 +20,7 @@
       <van-cell is-link title="软件更新" value="版本v1.2" />
       <van-cell is-link title="用户协议" @click="jumpToInstructions" />
     </van-cell-group>
-    <van-button size="large" class="logout-btn">退出登录</van-button>
+    <van-button size="large" class="logout-btn" @click="logout" >退出登录</van-button>
 
     <base-dialog
       base-dialog-title="推荐人邀请码"
@@ -44,6 +44,8 @@
 </template>
 
 <script>
+import { logoutToApp } from "@/utils/bridgeToAppFun";
+import { logout } from "@/api/user";
 import { fillInviteCode } from "@/api/user";
 import BaseDialog from "../components/BaseDialog.vue";
 export default {
@@ -58,6 +60,13 @@ export default {
     };
   },
   methods: {
+    logout() {
+      const params = {
+        token: "qwedskdljlkjlklkjlkjlkjl"
+      }
+      logout(params).then()
+      logoutToApp()
+    },
     jumpToInstructions() {
       this.$router.push("/instructions");
     },
@@ -73,8 +82,8 @@ export default {
       const params = {
         inviteCode: this.fillCode,
         userId: "18757121665"
-      }
-      fillInviteCode(params).then()
+      };
+      fillInviteCode(params).then();
     },
     fillInviterCode() {
       if (this.inviteeCode === "未填写") {