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

rc-busness/ajax/getData.js

@@ -56,7 +56,7 @@ export const getleckCourse = (name, offset) => {
  * 加入购物车
  */
 
-export const postCourseId = (productCode,buyCount,memberId, mobile,productImg,productName,productPrice,specifications) => {
+export const postCourseId = (productCode, buyCount, memberId, mobile, productImg, productName, productPrice, specifications, leftAllotment) => {
   var data = {
     buyCount: buyCount,
     memberId: memberId,
@@ -65,7 +65,8 @@ export const postCourseId = (productCode,buyCount,memberId, mobile,productImg,pr
     productImg: productImg,
     productName: productName,
     productPrice: productPrice,
-    specifications:specifications
+    specifications: specifications,
+    leftAllotment: leftAllotment
   }
   return fetch('/insertCartProductInfo', data, 'POST')
 }
@@ -81,10 +82,11 @@ export const postCourseId = (productCode,buyCount,memberId, mobile,productImg,pr
  * 删除购物车
  */
 export const deleteCart = ( productCode) => {
+	debugger;
   var data = {
-    productCode:productCode
+    productCode
   }
-  return fetch('cancelCartProductInfo',data,'POST')
+  return fetch('cancelCartProductInfo',productCode,'POST')
 }
 /**
  * 购物车批量提交
@@ -187,16 +189,14 @@ export const userquery = (stype, ) => {
   return fetch('goods?petType=' + stype, data, 'POST')
 }
 //处方信息
-export const userque = (stype, curPage,curRow) => {
+export const userque = (goodsName, curPage,curRow) => {
 	if(!curPage)
 		curPage=1;
 	if(!curRow)
 		curRow=10;
   let queryTail='page='+curPage+'&rows='+curRow;
-  if(stype)
+  if(goodsName)
-	queryTail = '?stype='+queryTail+'&'+queryTail;
+	queryTail = '?goodsName='+goodsName;
-  else
-	queryTail = '?'+queryTail;
   var data = {
   }
   return fetch('goods' + queryTail, data, 'POST')
@@ -620,9 +620,12 @@ export const getOrderList = (user, status) => {
   return fetch('memberAddress?type=' + type, data, 'POST')
 }
 
+//微信支付二维码
+export const updateOrderWX = (data) => {
+  return fetch('updateOrderWX', data, 'POST')
+}
 
 //支付宝支付二维码
 export const generateOrderAlipay = (data) => {
   return fetch('generateOrderAlipay', data, 'POST')
 }
-    

rc-busness/assets/css/openaddress.less

@@ -22,8 +22,9 @@
   .rc-button{
       display: flex;
       align-items: center;
-      justify-content: center;
+     justify-content: flex-end;
-      width: 375px;
+     width: 100%;
+    
 height: 80px;
 background: #FFFFFF;
 box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
@@ -38,6 +39,7 @@ opacity: 1;
 border-radius: 30px;
 background: #E2001A;
 display: flex;
+margin-right: 20px;
 justify-content: center;
 align-items: center;
 font-size: 16px;

rc-busness/components/tabs.vue

@@ -1,12 +1,11 @@
 <template>
  <div class="crumbs" v-if="showTab">
 	<el-breadcrumb separator-class="el-icon-arrow-right">
-  <el-breadcrumb-item :to=item.path   v-for="(item, index) in titleLists"
+		<el-breadcrumb-item to="/" >{{ this.homepageName }}</el-breadcrumb-item>
-        :key="index">{{ item.meta.title }}</el-breadcrumb-item>
-  <!-- <el-breadcrumb-item>商品管理</el-breadcrumb-item>
-  <el-breadcrumb-item>商品分类</el-breadcrumb-item> -->
-</el-breadcrumb>
 		
+		<el-breadcrumb-item :to=item.path   v-for="(item, index) in crumbs"
+		:key="index">{{ item.title }}</el-breadcrumb-item>
+	</el-breadcrumb>
   </div>
 </template>
 
@@ -14,93 +13,25 @@
 import { mapState, mapMutations } from "vuex";
 
 export default {
+	props:["crumbs"],
+	name:"crumbs",
     data() {
 		return {
-      title: "",
+			homepageName:'首页'
-      path: "",
-      titleLists: [
-       {
-             path: '/',
-    name: 'index',
-    meta:{
-      title: '首页',
- 
-    }
-       }
-
-      ],
-      showTab: true,
-      isShow: true,
 		};
 	},
-
+	created(){
-
+		if(this.showTab != false)
-    watch: {
+			this.showTab=true;
-    $route() {
-      this.setTitle();
 	},
+	watch: {
 	},
 	mounted() {
-    this.setTitle(); 
 	},
 
 	methods: {
-    ...mapMutations(["changemessage",'selectMenu']),
+		...mapMutations(["changemessage",'selectMenu'])
-       setTitle() {
-              console.log(this.$route.matched);
-              console.log(this.titleLists);
-                    let userinfo=[]
-   
-
- let saveUserInfo={
-    path:'admin',
-   name:'1',
-   meta:'b341181c-aced-11e9-89bf-00163e0e8daf',
-
 	}
-   userinfo.push(this.$route.matched);
-   let list=[];
-   console.log(userinfo);
-   userinfo.map(item=>{
-      console.log(item);
-      list=item;
-   })
- console.log(list);
- let anlist={
-    path:'admin',
-   name:'1',
-   meta:'b341181c-aced-11e9-89bf-00163e0e8daf',
- }
-   list.forEach(element=>{
-     console.log(element);
-     anlist=element
-   })
-                 for(let i in list){
-                   saveUserInfo.path=list[i].path;
-                      saveUserInfo.name=list[i].name;
-                      saveUserInfo.meta=list[i].meta;
-                   }
-                        console.log(saveUserInfo);
-                // store.commit('se', current.name);
-               this.selectMenu({ data: saveUserInfo });
-      console.log(this.$store.state.tabsList);
-      this.titleLists=this.$store.state.tabsList;
-      // console.log(userlisa);
-      console.log(this.titleLists);
-    },
-  },
-  // created(){
-  //  let user=this.$store.state.tabsList;
-  //    this.tags=user;
-  //    console.log(this.tags);
-  //   console.log(user);
-  //    console.log(this.$store.state.tabsList)
-  // },
-  
-  // mounted(){
- 
-  // }
-
 };
 </script>
 

rc-busness/pages/index.vue

@@ -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/settlement.vue

@@ -97,7 +97,12 @@
         </div>
       </div>
     </div>
-    <el-dialog :visible.sync="dialogAdd" class="diallog_width" width="'100%" :title="dialogAddTitle">
+    <el-dialog
+      :visible.sync="dialogAdd"
+      class="diallog_width"
+      width="'100%"
+      :title="dialogAddTitle"
+    >
       <div class="tc dl_cont" v-if="dialogAdd">
         <myAddress
           @isClose="dialogCtrl"
@@ -111,7 +116,7 @@
       width="'100%"
       title="选择收货地址"
     >
-      <div class="tc dl_cont" style="padding-bottom: 50px;position: relative;">
+      <div class="tc dl_cont" style="padding-bottom: 50px; position: relative">
         <div class="pop_list">
           <el-row
             class="mypersonal"
@@ -120,7 +125,10 @@
             :class="item.isDefault ? 'active' : ''"
           >
             <el-col :span="4"
-              ><input type="checkbox" v-model="item.checked" @click="selectPopAddress(item)"
+              ><input
+                type="checkbox"
+                v-model="item.checked"
+                @click="selectPopAddress(item)"
             /></el-col>
             <el-col :span="16" class="tl">
               <div>
@@ -213,7 +221,7 @@ export default {
       this.useraddress = data;
     },
     editAddress(item) {
-      this.dialogAddTitle='修改收货地址'
+      this.dialogAddTitle = "修改收货地址";
       this.editAddressData = {
         memberId: item.memberId,
         name: item.recipient,
@@ -231,7 +239,7 @@ export default {
       this.dialogAdd = true;
     },
     addAddress() {
-      this.dialogAddTitle='新增收货地址'
+      this.dialogAddTitle = "新增收货地址";
       this.editAddressData = {};
       this.dialogAdd = true;
     },
@@ -239,9 +247,9 @@ export default {
       this.useraddress.forEach((item) => {
         if (item.id == cur.id) {
           item.isDefault = true;
-          item.checked=true
+          item.checked = true;
         } else {
-           item.checked=false
+          item.checked = false;
           item.isDefault = false;
         }
       });
@@ -250,9 +258,9 @@ export default {
       this.useraddress.forEach((item) => {
         if (item.id == cur.id) {
           item.isDefault = true;
-          item.checked=true
+          item.checked = true;
         } else {
-           item.checked=false
+          item.checked = false;
           item.isDefault = false;
         }
       });
@@ -344,7 +352,8 @@ export default {
             postData[0].orderAddress.addressUserName +
             " " +
             postData[0].orderAddress.addressPhoneNumber,
-          wxPay: "weixin://wxpay/bizpayurl?pr=4RJbokxzz",
+          // wxPay: "weixin://wxpay/bizpayurl?pr=4RJbokxzz",
+          wxPay: res.data,
         };
         this.$router.push({
           path: "/personal/userpay",
@@ -384,9 +393,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-
 @import url("../../assets/css/global.less");
 @import "./settlement.less";
 // @import url("../../assets/css/settlement.less");
-
 </style>

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/personal/userpay.vue

@@ -113,7 +113,8 @@ export default {
   computed: {},
   mounted() {
     this.userPayData = JSON.parse(this.$route.query.userPayData);
-    this.qrtext=this.userPayData.wxPay
+    this.qrtext=this.userPayData.wxPay;
+    this.payOrderWX()
   },
   methods: {
     closeDialogSuccess() {
@@ -141,15 +142,15 @@ export default {
       }
     },
     //支付监听
-    async updateOrderWX() {
+    async payOrderWX() {
       let res = await updateOrderWX();
       if (res.success) {
         this.qrtext = '成功加入群的二维码';
         this.dialogSuccess = true;
-        clearInterval(this.time);
+      } else if (res.fail)  {
-      } else {
         this.dialogFail = true;
-        clearInterval(this.time);
+      }else{
+        this.payOrderWX()
       }
     },
   },

rc-busness/pages/productdetails/producted.vue

@@ -568,7 +568,8 @@ export default {
         item.picFile,
         item.productName,
         item.basePrice,
-        item.specifications
+        item.specifications,
+        item.leftAllotment
       );
       if (data) {
         this.productlist = data;

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,6 +322,12 @@ import {
 export default {
   data() {
     return {
+		crumbs:[
+			{
+				path:'/productdetails/productlist/',
+				title:'产品列表',
+			}
+		],
 		value: "",
 		isLoading: false,
 		userstype: [],
@@ -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: '手机号码输入有误'
-        });
-        return
-      }else if(this.alladdress===''){
         this.$message({
           type: 'warning',
           message: '请输入详细地址 '
         });
         return
+      }if(!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === ""){
+              this.$message({
+          type: 'warning',
+          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;