Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-He-v3

rc-busness/pages/index.vue

@@ -1164,7 +1164,7 @@
 		}
 		window.addEventListener("scroll", this.handleScroll, true);
 		this.userchufang();//查询处方粮商品信息
-		
+
 		this.catmessage();//查询猫的信息
 		this.catclickGan();
 		this.catclickShi();
@@ -1468,9 +1468,9 @@
 			this.dataLoaded=false;
 			let data=[];
 			if(stype==undefined||stype==null){
-				data = await biaomessage(0,'',1,6);
+				data = await biaomessage(0,'',1,12);
 			}else{
-				data = await biaomessage(this.userserachlist,'',1,6);
+				data = await biaomessage(this.userserachlist,'',1,12);
 			}
 			if(data){
 				let userlist=[];
@@ -1546,12 +1546,14 @@
 		},
 
 		//请求处方量信息数据
-		async userchufang() {
+		async userchufang(item) {
+			if(!item)
+				item = this.discounchufang[0].title;
 			this.dataLoaded=false;
 			let list=[];
-			let data = await userque();
+			let data = await userque(item,1,8);
 			if(data){
-				list=data.slice(0,6);
+				list=data.slice(0,8);
 				this.processinformation=list;
 				this.chufanlist=data;
 				this.dataLoaded=true;
@@ -1560,15 +1562,17 @@
         //点击请求处方量标签信息数据
 		async userquery(item) {
 			this.dataLoaded=false;
+			let list=[];
 			let data = await userquery(item);
 			if(data){
-				this.processinformation=data;
+				list=data.slice(0,8);
+				this.processinformation=list;
 				this.dataLoaded=true;
 			}
 		}, 
 		//处方用粮筛选
 		userclick(item,index){
-		   this.userquery(index)
+		   this.userchufang(index)
 		},
          //全价猫干粮筛选
 		catclickGan(){

rc-busness/pages/myorder/usertion.vue

@@ -146,6 +146,7 @@
 
 <script>
 import Myheader from "~/components/header.vue";
+import { mapMutations } from "vuex";
   import { userin} from "../../ajax/getData";
   import MyFooter from '~/components/rc-footer.vue'
     import {selectaddress,canceldanhao,generateOrderWX} from "../../ajax/getData";
@@ -168,6 +169,7 @@ export default {
       usersalesAmount:'',
       leftico: require("../../assets/image/rc-left.png"),
       orderNumber:'',
+      userdata:"",
        usermessage:null,
          userid: null,
       useralllist:[],
@@ -196,7 +198,11 @@ export default {
     };
   },
   methods: {
-
+...mapMutations(["checkIsLogin"]),
+	refreshDesktopNav:function(){
+		RCDL.navigation.currentState=null;
+		RCDL.navigation.rebuild();
+	},
     //取消订单
         async canceldanhao(orderNumber) {
       let data = await canceldanhao(this.userphone,this.orderNumber);
@@ -221,6 +227,12 @@ userpay(){
  if(this.goldastates==0){
     this.canceldanhao();
  }
+ else if( this.customer='联系客服申请售后'){
+    	var option = {
+					customer: {id: '', name: '', email: '', mobile: '', memberId: this.userdata.data.id}
+				}
+				dis_livchat(option);
+ }
 },
 //订单支付和再次购买
    onceagain(){
@@ -317,6 +329,9 @@ if(data){
 
   },
   mounted() {
+    this.checkIsLogin();
+this.userdata=this.$store.state.userInfo;
+console.log(this.userdata);
     this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
        this.userid = this.usermessage.data.id;
        this.userphone=this.usermessage.data.mobile;

rc-busness/pages/personal/useraddress.vue

@@ -54,7 +54,7 @@
               </div>
               <div class="rc-userbottom">
                 <span>数量:{{ item.pcs }}件</span>
-                <i>￥{{  }}</i>
+                <i>￥10</i>
               </div>
               <div class="rc-userbottomm">
                 <i>￥{{ item.userprice }}</i>
@@ -289,6 +289,9 @@ export default {
       this.goldmedal = data;
       this.alllist=[];
       this.useralllist=[];
+      this.obligation=[];
+      this.receiving=[];
+      this.pending=[];
       for (let i = 0; i < this.goldmedal.length; i++) {
         this.useralllist.push(this.goldmedal[i].orderDetailList[0]);
          this.alllist.push(this.goldmedal[i].orderDetailList[0])
@@ -299,10 +302,11 @@ export default {
         }else if(this.goldmedal[i].status==1){
           this.receiving.push(this.goldmedal[i].orderDetailList[0]);
         }
-        else if(this.goldmedal[i].status==4){
+        else if(this.useralllist[i].status==2){
           this.pending.push(this.goldmedal[i].orderDetailList[0]);
         }
       }
+     
         for (var i = 0; i < this.useralllist.length; i++) {
         this.useralllist[i].orderNumber = this.goldmedal[i].orderNumber;
         this.useralllist[i].status = this.goldmedal[i].status;
@@ -346,7 +350,7 @@ export default {
         //     addressDetailInfo: orderAddress[0].detailAddress,
         //   },
         // };
-         postData.push(oneProduct);
+        //  postData.push(oneProduct);
     let res = await generateOrderWX(postData);
            let userPayData = {
           orderId: res.data,
@@ -383,7 +387,7 @@ export default {
           message: "取消订单成功",
         });
         setTimeout(() => {
-            this.indet();
+            this.indet(this.userdata);
             this.activeIndex=0;
             this.useralllist=[];
         }, 500);

rc-busness/pages/productdetails/productlist.vue

@@ -2,6 +2,7 @@
   <div>
     <Myheader></Myheader>
     <div class="rc-top"></div>
+	<tabs :crumbs="crumbs"></tabs>
     <div class="rc-max-width--xl rc-main">
       <div class="usersearch">
         <div class="usercontentshow" ref="usercontent">
@@ -310,6 +311,7 @@
 import Myheader from "~/components/header.vue";
 import MyFooter from '~/components/rc-footer.vue'
 import FixRight from "~/components/fixed-right.vue";
+import tabs from "~/components/tabs.vue";
 import {
   userstype,
   biaome,
@@ -320,21 +322,27 @@ import {
 export default {
   data() {
     return {
-      value: "",
-      isLoading: false,
-      userstype: [],
-      activeIndex: "0",
-      allacindex: 0,
-      userishwo: true,
-      userishwo4: true,
-      userserachlist: [
-        {
-          categoryName: [], //专区
-          tagUsedAge: [], //年龄
-          tagFunction: [], //功能
-          tagBreed: [], //品种
-        },
-      ],
+		crumbs:[
+			{
+				path:'/productdetails/productlist/',
+				title:'产品列表',
+			}
+		],
+		value: "",
+		isLoading: false,
+		userstype: [],
+		activeIndex: "0",
+		allacindex: 0,
+		userishwo: true,
+		userishwo4: true,
+		userserachlist: [
+		{
+			categoryName: [], //专区
+			tagUsedAge: [], //年龄
+			tagFunction: [], //功能
+			tagBreed: [], //品种
+		},
+		],
       activeIndex1: 0,
       activeIndexa: "-1",
       dialogInfo1: false,
@@ -343,6 +351,7 @@ export default {
       activeIndexd: "-1",
       activeIndexe: "-1",
       activeIndexf: "-1",
+	  inRxGoods:false,
       isadrond: true,
       isshow: false,
       openshow: false,
@@ -476,7 +485,8 @@ export default {
   components: {
     Myheader,
     MyFooter,
-	FixRight
+	FixRight,
+	tabs
   },
   created() {
 	  this.routeParams=this.$route.query;
@@ -527,7 +537,7 @@ export default {
 					}
 				}
 			}
-			data = await searchchanpin(searchCriteria, usertype, 1, 12);
+			data = await searchchanpin(searchCriteria, usertype, 1, 120);
 		}
 		if (data) {
 			this.rccontair = data;
@@ -698,9 +708,12 @@ export default {
 					tmp.checked=true;
 				}
 			});
+			this.inRxGoods=true;
 		}
-		else
+		else {
 			this.prefecture[this.rxGoodsIndexPointer].checked=false;
+			this.inRxGoods=false;
+		}
 	},
 	resetAllOptions(){
 		let _self = this;
@@ -736,7 +749,7 @@ export default {
     	let isRxGoods=false;
     	let productCode = [];
     	let mainProductCode = item.productCode;
-    	if(!item.ecPrice && !item.price)
+    	if(this.inRxGoods)
     	{
     		isRxGoods=1;
     		productCode = [item.productCode];

rc-busness/pages/useraddress/addaddress.vue

@@ -104,23 +104,23 @@ export default {
     
    register(){
      console.log(this.tel)
-            if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === "") {
+            if (  this.alladdress==='') {
         this.$message({
           type: 'warning',
-          message: '手机号码输入有误'
+          message: '请输入详细地址 '
         });
         return
-      }else if(this.alladdress===''){
+      }if(!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === ""){
               this.$message({
           type: 'warning',
-          message: '请输入详细地址'
+          message: '手机号码输入有误'
         });
         return
       }
       else if(this.userpeople===''){
               this.$message({
           type: 'warning',
-          message: '请输入姓名'
+          message: '请填写收货人'
         });
         return
       }

rc-busness/pages/useraddress/openaddress.vue

@@ -158,7 +158,7 @@ export default {
       if(data){
             this.$message({
           type: 'warning',
-          message: '删除成功'
+          message: '地址删除成功'
         });
       }
      this.editaddress();

rc-busness/pages/usersearch/search.vue

@@ -363,6 +363,7 @@ export default {
       activeIndexd: "-1",
       activeIndexe: "-1",
       activeIndexf: "-1",
+	  inRxGoods:false,
       isadrond: true,
       isshow: false,
       openshow: false,
@@ -590,7 +591,7 @@ export default {
 					}
 				}
 			}
-			data = await searchchanpin(searchCriteria, usertype, 1, 12);
+			data = await searchchanpin(searchCriteria, usertype, 1, 120);
 		}
 		if (data) {
 			this.rccontair = data;
@@ -706,9 +707,12 @@ export default {
 					tmp.checked=true;
 				}
 			});
+			this.inRxGoods=true;
 		}
-		else
+		else {
 			this.prefecture[this.rxGoodsIndexPointer].checked=false;
+			this.inRxGoods=false;
+		}
 	},
 	resetAllOptions(){
 		let _self = this;