Merge branch 'yb5.1'

mixin/questionMixin.js

@@ -43,6 +43,7 @@ export default {
                     has_apply:false
                 }
             }, *///无权限用户信息
+		    updateHasApply:false
         }
     },
     computed:{
@@ -298,13 +299,26 @@ export default {
             this.pupData.show = true
         },
         //拨号
-        handleCallPhone(tel) {
+        async handleCallPhone(tel) {
             uni.makePhoneCall({
                 phoneNumber: tel ? tel : ' ',
                 success: () => {
                     this.pupData.show = false
                 }
             });
+            if(!this.noAuthInfo.customer_info.has_apply && !this.updateHasApply){
+                // 请求申请
+                const res = await apiApplyPermission({
+                    company_name: this.noAuthInfo.customer_info.company_name,
+                    real_name: this.noAuthInfo.customer_info.name,
+                    source: 5,
+                    from_page: '问答社区'
+                })
+                if (res.code === 200) {
+                    this.updateHasApply = true
+                    console.log('自动申请成功');
+                }
+            }
         },
         //弹窗申请权限
         async handleApply() {

pages-question/answerDetail.vue

@@ -245,6 +245,7 @@
 import mixin from "../mixin/questionMixin";
 import { apiReplayAsk, apiGetQuestion, apiSetRead,apiCountAudioClick } from "@/api/question";
 import { apiApplyPermission} from '@/api/user';
+import {apiGetSceneToParams} from "../api/common.js"
 import { uploadAudioToServer } from "@/utils/upload";
 export default {
   mixins: [mixin],
@@ -287,9 +288,17 @@ export default {
 			}, *///mock用户信息
     };
   },
-  onLoad(options) {
+  async onLoad(options) {
     this.initAudio();
-    this.getQuestionItem(options.id);
+		let obj={}
+		if(options.scene){
+			// 小程序码进来的
+			let res = await apiGetSceneToParams({scene_key:options.scene})
+			if(res.code==200){
+				obj=JSON.parse(res.data)
+			}
+		}
+    this.getQuestionItem(obj.id || options.id);
   },
   onShow(){
     uni.authorize({

pages-question/answerList.vue

@@ -26,7 +26,7 @@
             <view style="flex: 1" class="question-title">
               <text
                 class="item-label"
-                v-if="isUserResearcher || item.reply_status === 3"
+                v-if="(item.reply_status === 3 || item.replier_user_id == userInfo.user_id) && questionStatus!=2"
                 >{{ item.variety_tag_name }}</text
               >
               {{ item.question_content }}
@@ -120,6 +120,8 @@ export default {
       selectKey: "Wait",
       pauseImgSrc: "../static/question/recordplay.png",
       playImgSrc: "../static/question/recordpause.png",
+	  // 列表的状态 0-全部 2-未回答 3-已回答 4-待回答
+	  questionStatus:0,
       /* userInfo:{
 				is_inner:1,//0:外部客户;1内部员工
 				status:'试用',
@@ -152,23 +154,43 @@ export default {
 	},
   methods: {
     toDetail(item) {
+		// 未回答的不进行操作
+		if(this.questionStatus == 2) return 
       //reply_status:1-待分配 2-待回答 3-已回答
-      if (this.isUserResearcher&& item.reply_status === 2) {
+      if (this.isUserResearcher && item.reply_status === 2 && item.replier_user_id == this.userInfo.user_id) {
+		  // 是研究员 && 问题是待回答 && 回答者是我
         uni.navigateTo({ url: "/pages-question/answerDetail?id=" + item.id });
       }
     },
     //点击bar
     changeBar({ key }) {
-      if (key === this.selectKey) return;
-      this.selectKey = key;
-      this.questionList = [];
-      this.page = 1;
+		if (key === this.selectKey) return;
+		this.selectKey = key;
+		this.questionList = [];
+		this.page = 1;
+		// 重新获取数量
+		apiBarTotal().then(res=>{
+		  if(res.code == 200){
+			  const { replied, wait, total,distribute } = res.data;
+			  for (const bar of this.barList) {
+				if(bar.label == '已回答'){
+				  bar.num = replied
+				}else if(bar.label == '未回答'){
+				  bar.num = wait
+				}else if(bar.label == '全部'){
+				  bar.num = total
+				}else if(bar.label == '待回答'){
+				  bar.num = distribute
+				}
+			  }
+		  }
+		});
       this.resetAudio();
       this.getQuestionData();
     },
     getSelectKey() {
       if(this.userInfo.is_inner === 1){
-        this.selectKey = 'Wait'
+        this.selectKey = 'Distribute'
       }else{
         this.selectKey = 'Replied'
       }
@@ -176,7 +198,7 @@ export default {
     async getBarList() {
       const res = await apiBarTotal();
       if (res.code !== 200) return;
-      const { replied, wait, total } = res.data;
+      const { replied, wait, total,distribute } = res.data;
       //客户: 已回答 未回答 全部
       const customBar = [
         {
@@ -195,12 +217,17 @@ export default {
           num: total,
         },
       ];
-      //研究员: 待回答 已回答 全部
+      //研究员: 待回答 未回答 已回答 全部
       const researBar = [
         {
           label: "待回答",
-          key: "Wait",
-          num: wait,
+          key: "Distribute",
+          num: distribute,
+        },
+        {
+          label:'未回答',
+          key:'Wait',
+          num:wait,
         },
         {
           label: "已回答",
@@ -216,7 +243,8 @@ export default {
       this.barList = this.isUserResearcher ? researBar : customBar;
     },
     async getQuestionData() {
-      const reply_status = { Wait: 2, Replied: 3, Total: 0 };
+      const reply_status = { Wait: 2, Replied: 3, Total: 0 ,Distribute:4};
+	  this.questionStatus = reply_status[this.selectKey]
       await this.getQuestionList(reply_status[this.selectKey],1);
       this.setQuestionsRead()
     },
@@ -224,7 +252,8 @@ export default {
       //获取未读的数据,请求未读接口变为已读
       let unReadArr = []
       this.questionList.forEach(item=>{
-        let isReadKey = this.isUserResearcher?'replier_is_read':'is_read'
+        /* let isReadKey = this.isUserResearcher?'replier_is_read':'is_read' */
+        let isReadKey = item.user_id===this.userInfo.user_id?'replier_is_read':'is_read'
         if(item[isReadKey]===0){
           unReadArr.push(item.community_question_id)
         }
@@ -249,14 +278,21 @@ export default {
   padding: 30rpx;
   .answer-bar {
     display: flex;
-    justify-content: space-between;
+    /* justify-content: space-between; */
+    overflow-x: scroll;
+    &::-webkit-scrollbar{
+        width: 0;
+        display: none;
+    }
     .bar-item {
       width: 206rpx;
+      min-width: 206rpx;
       color: #666666;
       background-color: #f5f5f5;
       height: 70rpx;
       line-height: 70rpx;
       text-align: center;
+      margin-right: 20rpx;
       &.active {
         background-color: #fdf8f2;
         color: #e3b377;

pages/question/question.vue

@@ -67,15 +67,40 @@
 					<text class="item-time">提问时间:{{ item.create_time }}</text>
 				</view>
 			</view>
-			<view class="topage-btn" @click="toPage" v-if="isUserResearcher||userInfo.status&&userAuth">
+			<template v-if="isUserResearcher">
+				<view class="btn-wrap">
+					<view class="btn topage-button" @click="toPage('question')" v-if="userInfo.status&&userAuth">
+						<image 
+							src="../../static/question/askquestion.png"
+							mode="scaleToFill"
+							style="width:34rpx;height:34rpx;"
+						/>
+						<text>我要提问</text>
+					</view>
+					<view class="btn topage-button" @click="toPage('ask')" v-if="userInfo.status&&userAuth">
+						<view>待回答<text v-if="isUserResearcher" style="margin-left:5rpx;">{{'('+distributeNum+')'}}</text></view>
+					</view>
+				</view>
+			</template>
+			<template v-else>
+				<view class="topage-btn topage-button" @click="toPage('question')" v-if="userInfo.status&&userAuth">
+					<image 
+						src="../../static/question/askquestion.png"
+						mode="scaleToFill"
+						style="width:34rpx;height:34rpx;"
+					/>
+					<text>我要提问</text>
+				</view>
+			</template>
+			<!-- <view class="topage-btn" @click="toPage" v-if="isUserResearcher||userInfo.status&&userAuth">
 				<image 
 					v-if="!isUserResearcher"
 					src="../../static/question/askquestion.png"
 					mode="scaleToFill"
 					style="width:34rpx;height:34rpx;"
 				/>
-				{{ isUserResearcher ? '待回答' : '我要提问' }} <text v-if="isUserResearcher" style="margin-left:5rpx;">{{'('+waitNum+')'}}</text>
-			</view>
+				{{ isUserResearcher ? '待回答' : '我要提问' }} <text v-if="isUserResearcher" style="margin-left:5rpx;">{{'('+distributeNum+')'}}</text>
+			</view> -->
 		</template>
 		 <!-- 没有权限 -->
 		<template v-else>
@@ -123,11 +148,11 @@ export default {
 			selectName:'',
 			pauseImgSrc:'../../static/question/recordplay.png',
 			playImgSrc:'../../static/question/recordpause.png',
-			waitNum:0,
+			distributeNum:0,
 			/* userInfo:{
 				is_inner:1,//0:外部客户;1内部员工
 				status:'试用',
-				is_suspend:1,
+				is_suspend:0,
 				is_researcher:0,
 				//seal_name:'梁娜',
 				//seal_mobile:123456,
@@ -148,7 +173,7 @@ export default {
 		this.getQuestionList(3) */
 	},
 	onShow() {
-		this.getWaitNum()
+		this.getdistributeNum()
 		this.getOptionList()
 		this.getQuestionList(3)
 	},
@@ -166,12 +191,12 @@ export default {
 	},
 	methods: {
 		//获取研究员问答列表数量统计
-		getWaitNum() {
+		getdistributeNum() {
 			if(this.userInfo.is_inner!==1) return
 			//如果是研究员,则请求问答列表数量统计
 			apiBarTotal().then(res=>{
 				if(res.code===200){
-					this.waitNum = res.data.wait
+					this.distributeNum = res.data.distribute
 				}
 			})
 		},
@@ -216,12 +241,11 @@ export default {
 			this.isPopupShow = false
 		},
 		//点击'我要提问' or '待回答'
-		toPage() {
-			//const {is_inner} = this.userInfo
-			if (this.isUserResearcher) {
-				uni.navigateTo({ url: '/pages-question/answerList' })
-			} else {
+		toPage(type) {
+			if(type==='question'){
 				uni.navigateTo({ url: '/pages-question/hasQuestion' })
+			}else{
+				uni.navigateTo({ url: '/pages-question/answerList' })
 			}
 		},
 		//转发分享
@@ -362,6 +386,8 @@ page {
 		margin-left: -257rpx;
 		bottom: 215rpx;
 		width:514rpx;
+	}
+	.topage-button{
 		height: 80rpx;
 		text-align: center;
 		line-height: 80rpx;
@@ -377,6 +403,22 @@ page {
 			margin-top: -2rpx;
 		}
 	}
+
+	.btn-wrap{
+		position: fixed;
+		width:100%;
+		margin-left: -30rpx;
+		display: flex;
+		justify-content: center;
+		bottom: 215rpx;
+		.btn{
+			width:300rpx;
+			height:80rpx;
+			&:first-child{
+				margin-right: 30rpx;
+			}
+		}
+	}
 	.global-pup{
 		.content{
 			padding:90rpx 34rpx;