feat:专员邀约新增备注

common/js/env.js

@@ -2,7 +2,7 @@
 
 // let baseUrl = `https://jje.admin.xinyuekj.com.cn`
 let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
-// let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
+// let baseUrl = `http://test.admin.xinyuekj.com.cn`
 // let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
 
 

common/js/service.js

@@ -2,6 +2,14 @@ import request from '../js/request.js';
 
 
 export default {
+    //添加备注
+    bind(data) {
+        return request({
+            url: '/expand/bind',
+            method: 'PUT',
+            data: data
+        })
+    },
     //累计拓客数据
     expandAppTotal() {
         return request({

main.js

@@ -8,8 +8,8 @@ import uView from "uview-ui";
 import commonUtils from "./common/js/utils/commonUtils";
 // #ifdef H5
 // 提交前需要注释  本地调试使用 使用vconsole
-// const vconsole = require('vconsole')
-// Vue.prototype.$vconsole = new vconsole()
+const vconsole = require('vconsole')
+Vue.prototype.$vconsole = new vconsole()
 // #endif
 import api from './common/js/api'
 import env from './common/js/env.js';

manifest.json

@@ -2,8 +2,8 @@
     "name" : "娇骄儿拓客",
     "appid" : "__UNI__0AD3309",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.1",
+    "versionCode" : "101",
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -103,7 +103,7 @@
 			"path" : "pages/directPromotionList/directPromotionList",
 			"style" :
 			{
-				"navigationBarTitleText" : "我的直推",
+				"navigationBarTitleText" : "累计邀约",
 				"enablePullDownRefresh" : false
 			}
 		},
@@ -233,6 +233,13 @@
 			{
 				"navigationBarTitleText" : "我的角色"
 			}
+		},
+		{
+			"path" : "pages/pdfView/pdfView",
+			"style" : 
+			{
+				"navigationBarTitleText" : "文件预览"
+			}
 		}
 	],
 	"tabBar": {

pages/directPromotionList/directPromotionList.vue

@@ -7,6 +7,9 @@
 			<mescroll-item ref="MescrollItem" :i="0"  :index="0"  :height="height">
 			</mescroll-item>
 		</view>
+
+
+
 		<!--#ifdef H5-->
 		<liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
 		<!--#endif-->
@@ -16,7 +19,7 @@
 <script>
 	import MescrollItem from "./module/mescrollUni-item.vue";
 	export default {
-		components: {MescrollItem},
+		components: { MescrollItem},
 		data() {
 			return {
 				height:'',

pages/directPromotionList/module/index.rpx.css

@@ -35,3 +35,29 @@
 .no{
     font-size: 24rpx;
 }
+.bzBtn{
+    background: #3c9cff;
+    width: 100rpx;
+    color: #FFFFFF;
+    font-size: 28rpx;
+    padding: 10rpx;
+    text-align: center;
+    border-radius: 10rpx;
+}
+.remarkPopup{
+    width: 560rpx;
+    background: #FFFFFF;
+    border-radius: 10rpx;
+    padding: 40rpx;
+}
+.btn{
+    width: 200rpx;
+}
+.mt20{
+    margin-top: 20px;
+}
+.borde{
+    border: 1rpx solid #F7F7F7;
+    padding: 5rpx 0;
+    border-radius: 10rpx;
+}

pages/directPromotionList/module/mescrollUni-item.vue

@@ -7,20 +7,38 @@
 	<!-- top的高度等于悬浮菜单tabs的高度 -->
 	<mescroll-uni :ref="'mescrollRef' + i" @init="mescrollInit" :height="height" :down="downOption" @down="downCallback"
 		:up="upOption" @up="upCallback" @emptyclick="emptyClick">
-		<view  class="flex-row justify-between item" v-for="(item,index) in list">
+		<view  class="flex-row justify-between item" v-for="(item,index) in list" :key="index">
 			<view class="flex-row avatar">
 				<image :src="'/static/ud4.png'"></image>
 			</view>
 			<view class="flex-row justify-between userMsg">
 				<view class="flex-col justify-center">
-					<text class="name">{{item.ncikName}}</text>
+					<text class="name">{{item.ncikName}}{{item.expand3 ? '('+item.expand3+')' : ''}}</text>
 					<text class="no">{{item.no}}</text>
+          <text class="time">2020-12-25 12:00:00</text>
 				</view>
 				<view class="flex-col justify-around">
-					<text class="time">{{item.createTime}}</text>
+          <text class="bzBtn" @click="addRemark(item.bindId)">备注</text>
 				</view>
 			</view>
 		</view>
+
+    <uni-popup ref="remarkPopup" type="center">
+      <view class="remarkPopup">
+        <view class="flex-row justify-center"><text>添加备注</text></view>
+
+        <view class="mt20 borde">
+          <input v-model="bindParam.expand3" focus  placeholder="请输入备注" />
+        </view>
+
+        <view class="flex-row justify-between mt20">
+          <button  size="mini" @click="closePup">取消</button>
+          <button  size="mini" type="primary" @click="bind">确定</button>
+        </view>
+
+      </view>
+    </uni-popup>
+
 	</mescroll-uni>
 </template>
 
@@ -34,6 +52,10 @@
 
 		data() {
 			return {
+        bindParam:{
+          id:null,
+          expand3:null
+        },
 				downOption: {
 					auto: false // 不自动加载 (mixin已处理第一个tab触发downCallback)
 				},
@@ -76,6 +98,31 @@
 		},
 
 		methods: {
+
+      bind(){
+        this.$api.service.bind(this.bindParam).then((res)=>{
+          this.$refs.remarkPopup.close()
+          this.downCallback()
+        })
+
+      },
+
+      closePup(){
+        this.bindParam = {
+          id:null,
+          expand3:null
+        }
+        this.$refs.remarkPopup.close()
+      },
+
+      addRemark(id){
+        this.bindParam = {
+          id:id,
+          expand3:null
+        }
+        this.$refs.remarkPopup.open()
+      },
+
 			/*下拉刷新的回调 */
 			downCallback() {
 				// 这里加载你想下拉刷新的数据, 比如刷新轮播数据

pages/pdfView/pdfView.vue

@@ -0,0 +1,59 @@
+<template>
+	<view>
+    <!-- #ifdef H5-->
+    <uni-nav-bar v-if="!$isWxBrowser()" :fixed="true" background-color="#FFE05C" :border="false" :statusBar="false"
+                 left-icon="left" title="文件预览" @clickLeft="back"/>
+    <!-- #endif -->
+
+    <web-view v-if="contract.url" :webview-styles="webviewStyles" :src="contract.url"></web-view>
+
+
+	</view>
+</template>
+
+<script>
+
+  export default {
+    components: {
+
+    },
+		data() {
+			return {
+        contract:null,
+        webviewStyles: {
+          progress: {
+            color: '#ffffff'
+          }
+        },
+			}
+		},
+
+    onLoad(e) {
+      if ( e.contract){
+        this.contract = JSON.parse(e.contract)
+      }
+    },
+
+		methods: {
+      back() {
+        let pages = getCurrentPages()
+        if (pages.length > 1) {
+          uni.navigateBack({
+            delta: 1,
+            fail: err => {
+              console.log(err)
+            }
+          })
+        } else {
+          uni.switchTab({
+            url: '/pages/index/index'
+          });
+        }
+      },
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/register/register.vue

@@ -329,7 +329,7 @@
                     console.log('验证不通过！！！！')
 
                     this.idCardAndName().then(res => {
-                        if (res.data.data.respCode !== '0000') {
+                        if (res.data.data != null && res.data.data.respCode !== '0000') {
 
                             this.rules.idCard.push({
                                 validator: (a, b, callback) => {

pages/specialistsDetail/index.rpx.css

@@ -41,3 +41,17 @@
     font-size: 30rpx;
     line-height: 80rpx;
 }
+.see{
+    background: #3c9cff;
+    color: #FFFFFF;
+    padding: 10rpx 10rpx;
+    border-radius: 10rpx;
+    margin-left: 20rpx;
+    font-size: 26rpx;
+}
+.contract{
+    width: 700rpx;
+    height: 700rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+}

pages/specialistsDetail/specialistsDetail.vue

@@ -77,6 +77,15 @@
                         </view>
                     </view>
 
+                  <view class="flex-row  msgItem">
+                    <view>
+                      <text>合同</text>
+                    </view>
+                    <view >
+                      <text class="see" @click="seeContract(expandUser.expand1)">点击查看</text>
+                    </view>
+                  </view>
+
 
                     <view class="flex-row justify-center">
                         <button class="jiechuBtn" type="warn" @click="unbind">解除绑定</button>
@@ -104,7 +113,7 @@
         </uni-popup>
 
 
-        <!--#ifdef H5-->
+      <!--#ifdef H5-->
         <liu-drag-button v-if="$isWxBrowser()" @clickBtn="back">返回</liu-drag-button>
         <!--#endif-->
     </view>
@@ -141,6 +150,29 @@
         },
         methods: {
 
+          seeContract(id){
+            console.log(id)
+
+            if (!id){
+              uni.showToast({
+                title: '暂无合同',
+                icon: 'error',
+                duration: 2000
+              });
+              return
+            }
+
+            this.$api.service.getImage(id).then(res=>{
+              res.data.data[0].url = res.data.data[0].url.replace(/^http:/, "https:")
+              if (res.data.data){
+                uni.navigateTo({
+                  url:'/pages/pdfView/pdfView?contract='+   JSON.stringify(res.data.data[0]),
+                })
+              }
+            })
+
+          },
+
             unbind(){
                 let that = this
                 uni.showModal({

pages/specialistsList/specialistsList.vue

@@ -34,7 +34,8 @@
 			this.height = sysInfo.windowHeight  - 70 + 'px' //除标题栏栏外的屏幕可用高度
 		},
 		onShow(){
-			this.$refs.MescrollItem.downCallback()
+
+
 		},
 		methods: {
 			openAddRemarkPopup(e){