添加 商品详情购物券 对接商品评论 修改新增商品评论接口 对接我的团队 对接客服中心问题列表 新增我的模块购物车商品组件（暂未开发）

src/api/client/business.js

@@ -143,8 +143,8 @@ export function addShoppingCart(data) {
  */
 export function getShoppingCart(data) {
   return request({
-    url: `/maintain/listCartItem`,
-    method: 'GET',
+    url: `/maintain/mineCartList`,
+    method: 'get',
     data: data,
     header: {
       'Content-Type': 'application/x-www-form-urlencoded',
@@ -160,7 +160,7 @@ export function getShoppingCart(data) {
 export function getCartList(id) {
   return request({
     url: `/maintain/listCartItem/${id}`,
-    method: 'GET',
+    method: 'get',
     header: {
       'Content-Type': 'application/json',
     },
@@ -232,16 +232,32 @@ export function generateOrder(data) {
   });
 }
 
+/**
+ * 商品评价接口 - 针对订单发布评价
+ * @param {*} data
+ * @returns
+ */
+export function accountToOrderGetComment(data) {
+  return request({
+    url: `/maintain/assess/query`,
+    method: 'post',
+    data:data,
+    header: {
+      'Content-Type': 'application/json',
+    },
+  });
+}
 
 /**
  * 商品评价接口 - 获取商品评价列表
  * @param {*} data
  * @returns
  */
-export function getGoodsConcentList(goodsId) {
+export function getGoodsConcentList(goodsId,data) {
   return request({
     url: `/maintain/goods/${goodsId}/comments`,
     method: 'get',
+    data:data,
     header: {
       'Content-Type': 'application/x-www-form-urlencoded',
     },
@@ -255,7 +271,7 @@ export function getGoodsConcentList(goodsId) {
  */
 export function goodsCommentsAdd(data) {
   return request({
-    url: `/maintain/goods/comments/add`,
+    url: `/maintain/assess/add`,
     method: 'post',
     data: data,
     header: {

src/api/client/mine.js

@@ -15,6 +15,22 @@ export function maintainFavoritePaging(data) {
   });
 }
 
+/**
+ * 收藏接口 - 查询用户收藏商品列表
+ * @returns
+ */
+export function getFavouriteGoods(data) {
+  return request({
+    url: '/maintain/favorites/goods',
+    method: 'get',
+    data: data,
+    header: {
+      'content-type': 'application/x-www-form-urlencoded',
+    },
+  });
+}
+
+
 /**
  * 用户接口 - 获取用户信息
  * @returns
@@ -75,6 +91,50 @@ export function maintainCouponPaging(data) {
   });
 }
 
+/**
+ * 优惠券领取记录接口 - 领取优惠券
+ * @returns
+ */
+export function acceptConpons(couponId) {
+  return request({
+    url: `/maintain/usercoupon/${couponId}/claim`,
+    method: 'post',
+    header: {
+      'content-type': 'application/x-www-form-urlencoded',
+    },
+  });
+}
+
+/**
+ * 优惠券领取记录接口 - 获取用户领取的优惠券列表
+ * @returns
+ */
+export function getUserAcceptCouponsList(data) {
+  return request({
+    url: '/maintain/usercoupons',
+    method: 'get',
+    data: data,
+    header: {
+      'content-type': 'application/x-www-form-urlencoded',
+    },
+  });
+}
+
+/**
+ * 优惠券接口 - 根据商家ID查询优惠券分页
+ * @returns
+ */
+export function accountTotIdGetConponList(merchantId,data) {
+  return request({
+    url: `/maintain/coupon/${merchantId}/paging`,
+    method: 'get',
+    data: data,
+    header: {
+      'content-type': 'application/x-www-form-urlencoded',
+    },
+  });
+}
+
 /**
  * 预约接口 - 查询用户预约列表
  * @returns
@@ -89,3 +149,33 @@ export function maintainReservations(data) {
     },
   });
 }
+
+/**
+ * 获取 - 我的客服中心
+ * @returns
+ */
+export function getProbleList(data) {
+  return request({
+    url: `/maintain/problem/list`,
+    method: 'post',
+    data:data,
+    header: {
+      'content-type': 'application/json',
+    },
+  });
+}
+
+/**
+ * 获取 - 我的客服中心
+ * @returns
+ */
+export function getMyTeam(data) {
+  return request({
+    url: `/maintain/invite/team/page`,
+    method: 'get',
+    data:data,
+    header: {
+      'content-type': 'application/x-www-form-urlencoded',
+    },
+  });
+}

src/components/service/goodsItem.vue

@@ -0,0 +1,147 @@
+<template>
+  <view class="sort">
+    <view class="list" :key="index" v-for="(itm, index) of item" @click='handlerRouterSkip(itm)'>
+      <view class="list-img">
+        <image class="img" :src="error || !loaded ? 'https://cdn.uviewui.com/uview/album/10.jpg' : itm.logo"
+          mode="scaleToFill"></image>
+      </view>
+
+      <view class="list-main">
+        <view class="item-text">{{ itm.name }}</view>
+        <view class="item-flex">
+          <view class="star">
+            <u-rate count="5" v-model="itm.score" :size="14" />
+            <text class="line">|</text>
+            <text class="points">{{ itm.specialPrice }}分</text>
+          </view>
+          <view>{{ itm.specialPrice }}单</view>
+        </view>
+        <view class="list-item">
+          <view class="item-l">{{ itm.description }}</view>
+          <view class="item-r"></view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        show: false,
+        showDate: false,
+        value1: Number(new Date()),
+        count: 2,
+        value: 10,
+      };
+    },
+    props: ['item'],
+    mounted() {
+      console.log('@@@@item', this.item);
+    },
+    methods: {
+      click(item) {},
+      open() {},
+      close() {
+        this.show = false;
+      },
+
+      // 点击跳转1
+      handlerRouterSkip(item) {
+        uni.navigateTo({
+          url: `/pages/client/clientPackage/serviceDetail/index?id=${item.id}`,
+        });
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  /*商家服务分类的是实现 */
+
+  .sort {
+    min-height: 100vh;
+
+    .list {
+      height: 250rpx;
+      background-color: #fff;
+      padding: 20rpx;
+      margin-bottom: 20rpx;
+      display: flex;
+
+      .list-img {
+        width: 260rpx;
+        height: 100%;
+        background-color: #ec5729;
+        margin-right: 20rpx;
+
+        image {
+          width: 100%;
+          height: 100%;
+        }
+      }
+
+      .list-main {
+        width: calc(100% - 280rpx);
+      }
+
+      .item-text {
+        font-weight: bold;
+        margin: 10rpx 0 10rpx;
+        color: #333;
+      }
+
+      .item-flex {
+        display: flex;
+        justify-content: space-between;
+        font-size: 28rpx;
+        margin: 0 20rpx 10rpx 0;
+        color: #0d0d0d66;
+
+        .star {
+          display: flex;
+
+          .line {
+            margin-left: 16rpx;
+            margin-top: 5rpx;
+            font-size: 22rpx;
+          }
+
+          .points {
+            color: #ff4b04;
+            font-size: 22rpx;
+            margin-top: 6rpx;
+            margin-left: 10rpx;
+          }
+        }
+      }
+
+      .list-item {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 40rpx;
+
+        .item-l {
+          color: #cfcfcf;
+        }
+
+        .item-r {
+          color: #252525;
+
+          .Buy {
+            width: 40px;
+            height: 32px;
+            color: #fff;
+            line-height: 32px;
+            text-align: center;
+            display: inline-block;
+            border-radius: 0 16px 16px 0;
+            background-color: #ec5729;
+            padding-bottom: 20rpx;
+          }
+        }
+      }
+    }
+  }
+</style>

src/components/service/index.vue

@@ -55,15 +55,15 @@ export default {
 
     // 点击跳转1
     handlerRouterSkip(item) {
-      if (this.skipType == 0) {
+      // if (this.skipType == 0) {
         uni.navigateTo({
           url: `/pages/client/clientPackage/storeDetail?id=${item.id}`,
         });
-      } else if (this.skipType == 1) {
-        uni.navigateTo({
-          url: `/pages/client/clientPackage/serviceDetail/index?id=${item.id}`,
-        });
-      }
+      // } else if (this.skipType == 1) {
+      //   uni.navigateTo({
+      //     url: `/pages/client/clientPackage/serviceDetail/index?id=${item.id}`,
+      //   });
+      // }
     },
   },
 };

src/components/shopCarItem/shopCarItem.vue

@@ -0,0 +1,20 @@
+<template>
+	<view>
+		123123
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"shopCarItem",
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style>
+
+</style>

src/pages.json

@@ -256,6 +256,12 @@
             "navigationBarTitleText": "联系客服"
           }
         },
+        {
+          "path": "serviceCenterDetail",
+          "style": {
+            "navigationBarTitleText": "问题详情"
+          }
+        },
         {
           "path": "personal",
           "style": {

src/pages/client/clientPackage/goodsEstimation.vue

@@ -22,19 +22,22 @@
     data(){
       return{
         queryParams:{
-          score:2,//评价打分
-          content:'测试打分111',//评价内容
-          goodsId: "1748379280745975820", // 商品id
-          orderId: "1763028797466587137", // 订单id
-          merchantId: "9", // 商家id
+          score:0,//评价打分
+          content:'',//评价内容
+          goodsId: "", // 商品id
+          orderId: "", // 订单id
+          merchantId: "", // 商家id
         },
       }
     },
+    onLoad(option){
+      this.queryParams.orderId = option.orderList.orderSn
+      this.queryParams.goodsId = option.goodsList.goodsId
+      this.queryParams.merchantId = option.orderList.merchantId
+    },
     methods:{
       // 测试提交
       handlerContextSumbit(){
-        console.log('@@@@queryParams',this.queryParams);
-        return
         goodsCommentsAdd(this.queryParams).then(res=>{
           console.log('@@@@res',res);
           if(res.code == 200){
@@ -42,7 +45,9 @@
               title:"评论成功",
               icon:'none'
             })
-            uni.navigateBack(-1)
+            setTimeout(()=>{
+              uni.navigateBack(-1)
+            },1500)
           }else{
             uni.showToast({
               title:res.msg,

src/pages/client/clientPackage/orderAll.vue

@@ -10,7 +10,7 @@
         <view class="order-item" v-for="(item,index) of init_list" :key="index" >
           <view class="" @click="handlerSkipDetail(item)">
             <view class="item-top">
-              <view class="top-left gray-color">订单编号 : 3000291847772181</view>
+              <view class="top-left gray-color">订单编号 : {{ item.orderSn }}</view>
               <view class="top-right ">待付款</view>
             </view>
             <view class="item-top">
@@ -21,21 +21,21 @@
 
           <u-line margin='20rpx 0'></u-line>
 
-          <view class="item-center" v-for="item of 3">
+          <view class="item-center" v-for="(itm,idx) of item.goodsInfo">
             <view class="center-left">
-              <image src="@/static/QR57a.jpg" class="img"></image>
+              <image :src="itm.goodsPic" class="img"></image>
             </view>
             <view class="center-right">
               <view class="r-l">
-                <view class="right-name"> 测试名称 </view>
+                <view class="right-name"> {{ itm.goodsName }} </view>
                 <view class="right-descript"> 测试商品描述111 </view>
                 <view class="l-box">
-                  <view class="right-price"> ￥1200 </view>
-                  <view class="right-numb"> ×1 </view>
+                  <view class="right-price"> ￥{{ itm.goodsPrice }} </view>
+                  <view class="right-numb"> ×{{ itm.goodsQuantity }} </view>
                 </view>
               </view>
               <view class="r-r">
-                <view class="r-item" @click.stop="handlerSkipComment(item)">
+                <view class="r-item" @click.stop="handlerSkipComment(item,itm)">
                   <u-icon name="chat" color="#000" size="28"></u-icon>
                   <span>评价</span>
                 </view>
@@ -46,8 +46,8 @@
           <u-line margin='20rpx 0' dashed='true'></u-line>
 
           <view class="item-allnumb-box">
-            <view class="allnumb-left"> 3件商品 </view>
-            <view class="allnumb-right"> <span class="r-text">共计</span>￥2371.19 </view>
+            <view class="allnumb-left"> {{ item.allNumb }}件商品 </view>
+            <view class="allnumb-right"> <span class="r-text">共计</span>￥{{ item.allPrice }}</view>
           </view>
 
           <view class="item-bottom">
@@ -108,7 +108,21 @@
     mounted() {
       this.userOrdersPage();
     },
-
+    computed:{
+      allNumber(){
+        this.init_list.map(rs=>{
+          let sum = 0
+          let price = 0
+          rs.goodsInfo.map(rc=>{
+            sum += rc.goodsQuantity
+            price += rc.goodsPrice
+          })
+          rs.allNumb = sum
+          rs.allPrice = price
+        })
+        return
+      }
+    },
     methods: {
       handlerChangeItem(data) {
         this.current = data.index;
@@ -151,9 +165,9 @@
         })
       },
       // 点击跳转到商品评价
-      handlerSkipComment(item){
+      handlerSkipComment(item,itm){
         uni.navigateTo({
-          url:"/pages/client/clientPackage/goodsEstimation"
+          url:`/pages/client/clientPackage/goodsEstimation?orderList=${JSON.stringify(item)}&goodsList=${JSON.stringify(itm)}`
         })
       }
     },

src/pages/client/clientPackage/orderDetail.vue

@@ -11,17 +11,17 @@
 
       <u-line margin='20rpx 0'></u-line>
 
-      <view class="item-center" v-for="item of 3">
+      <view class="item-center" v-for="(item,index) of init_list.goodsInfo">
         <view class="center-left">
           <image src="@/static/QR57a.jpg" class="img"></image>
         </view>
         <view class="center-right">
           <view class="r-l">
-            <view class="right-name"> 测试名称 </view>
+            <view class="right-name"> {{ item.goodsName }} </view>
             <view class="right-descript"> 测试商品描述111 </view>
             <view class="l-box">
-              <view class="right-price"> ￥1200 </view>
-              <view class="right-numb"> ×1 </view>
+              <view class="right-price"> ￥{{ item.goodsPrice }} </view>
+              <view class="right-numb"> ×{{ item.goodsQuantity }} </view>
             </view>
           </view>
         </view>
@@ -41,7 +41,7 @@
       <view class="top-t2">
         <view class="t2-item">
           <p>订单号</p>
-          <p>2884719002012</p>
+          <p>{{ init_list.orderSn }}</p>
         </view>
         <view class="t2-item">
           <p>下单时间</p>
@@ -53,7 +53,7 @@
         </view>
         <view class="t2-item">
           <p>商品总额</p>
-          <p>￥7.90</p>
+          <p>￥{{ allPrice }}</p>
         </view>
         <view class="t2-item">
           <p>优惠券</p>
@@ -70,24 +70,29 @@
     data() {
       return {
         init_list: {
-          goodsInfo: [{
-            goodsName: '测试名称111',
-            goodsQuantity: 12,
-            goodsPrice: 322
-          }]
+          // goodsInfo: [{
+          //   goodsName: '测试名称111',
+          //   goodsQuantity: 12,
+          //   goodsPrice: 322
+          // }]
         }
       }
     },
-    onLoad(e) {
-      // this.init_list = e.orderList
+    onLoad(option) {
+      this.init_list = option.orderList
+      console.log('@@@@init_list',this.init_list);
     },
-    methods: {
-      handlerSkipContext(item) {
-        uni.navigateTo({
-          url: "/pages/client/clientPackage/goodsEstimation"
+    computed:{
+      allPrice(){
+        let price = 0
+        this.init_list.goodsInfo.map(rs=>{
+          price += rs.goodsPrice
         })
-        console.log('@@@@item', item);
+        return price.toFixed(2)
       }
+    },
+    methods: {
+
     }
   }
 </script>

src/pages/client/clientPackage/serviceDetail/GainCoupon.vue

@@ -18,17 +18,19 @@
 
     <view>
       <view style="padding: 20rpx">店铺优惠</view>
-      <view class="coupon" v-for="(item, index) in coupons" :key="index">
-        <view class="coupon-left">
-          <text class="coupon-text">￥</text>
-          <text class="coupon-price">5</text>
-        </view>
-        <view class="coupon-center">
-          <view class="coupon-center-user">{{ item.name }}</view>
-          <view class="coupon-center-type">{{ item.description }}</view>
-        </view>
-        <view class="coupon-right">
-          <view class="claimable" v-show="true" @click="handlerGetCoupon(item, index)">可领取</view>
+      <view class="coupon-box">
+        <view class="coupon" v-for="(item, index) in coupons" :key="index">
+          <view class="coupon-left">
+            <text class="coupon-text">￥</text>
+            <text class="coupon-price">5</text>
+          </view>
+          <view class="coupon-center">
+            <view class="coupon-center-user">{{ item.name }}</view>
+            <view class="coupon-center-type">{{ item.description }}</view>
+          </view>
+          <view class="coupon-right">
+            <view class="claimable" v-show="true" @click="handlerGetCoupon(item, index)">可领取</view>
+          </view>
         </view>
       </view>
     </view>
@@ -36,224 +38,262 @@
 </template>
 
 <script>
-export default {
-  props: {
-    coupons: {
-      type: Array,
-      default: [],
+  import {
+    acceptConpons
+  } from "@/api/client/mine.js"
+  export default {
+    props: {
+      coupons: {
+        type: Array,
+        default: [],
+      },
     },
-  },
-  data() {
-    return {
-      list: [
-        {
-          id: 0,
-          title: '30天低价',
-          text: '当前商品价格为30天低价，比平时低48%',
-        },
-        {
-          id: 1,
-          title: '店铺新客立减',
-          text: '店铺新客购买该商品立减10元%',
-        },
-        {
-          id: 2,
-          title: '多件优惠',
-          text: '该商品满2件享9.5折%',
-        },
-      ],
-    };
-  },
-  methods: {
-    close() {
-      this.$emit('close', false);
+    data() {
+      return {
+        list: [{
+            id: 0,
+            title: '30天低价',
+            text: '当前商品价格为30天低价，比平时低48%',
+          },
+          {
+            id: 1,
+            title: '店铺新客立减',
+            text: '店铺新客购买该商品立减10元%',
+          },
+          {
+            id: 2,
+            title: '多件优惠',
+            text: '该商品满2件享9.5折%',
+          },
+        ],
+      };
     },
+    methods: {
+      close() {
+        this.$emit('close', false);
+      },
 
-    // 点击领取优惠卷
-    handlerGetCoupon() {
-      uni.showToast({
-        title: '没有',
-        icon: 'none',
-      });
+      // 点击领取优惠卷
+      handlerGetCoupon(item, index) {
+        console.log('@@@@item', item);
+        acceptConpons(item.id).then(res => {
+          console.log('@@@@res',res);
+          if (res.code == 200) {
+            uni.showToast({
+              title:'领取成功',
+              icon:'none'
+            })
+            this.close()
+          }else{
+            uni.showToast({
+              title:res.message,
+              icon:'none'
+            })
+            return
+          }
+        })
+      },
     },
-  },
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.container {
-  height: 900rpx;
-  box-sizing: border-box;
-  .chelvc-flex {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .detail {
-    height: 100rpx;
-    position: relative;
-    border-bottom: 1rpx solid #f4f4f4;
-    .closeIcon {
-      position: absolute;
-      top: 40rpx;
-      right: 30rpx;
+  .container {
+    height: 900rpx;
+    box-sizing: border-box;
+
+    .chelvc-flex {
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
-  }
 
-  .content {
-    padding: 10rpx 20rpx;
-    .itemList {
-      margin: 20rpx 0;
-      .title {
-        font-size: 30rpx;
-        color: #333;
-        margin-bottom: 8rpx;
+    .detail {
+      height: 100rpx;
+      position: relative;
+      border-bottom: 1rpx solid #f4f4f4;
+
+      .closeIcon {
+        position: absolute;
+        top: 40rpx;
+        right: 30rpx;
       }
-      .text {
-        font-size: 24rpx;
-        color: #999;
+    }
+
+    .content {
+      padding: 10rpx 20rpx;
+
+      .itemList {
+        margin: 20rpx 0;
+
+        .title {
+          font-size: 30rpx;
+          color: #333;
+          margin-bottom: 8rpx;
+        }
+
+        .text {
+          font-size: 24rpx;
+          color: #999;
+        }
       }
     }
-  }
-  .placeholder {
-    height: 30rpx;
-    background-color: #f4f4f4;
-    margin: 0 20rpx;
-  }
-  .coupon {
-    height: 150rpx;
-    margin: 10rpx 20rpx;
-    background-color: #faeaea;
-    border: 2rpx solid #eb8f8f;
-    display: flex;
-    align-items: center;
-    .coupon-text {
-      color: #e53f3f;
-      font-size: 30rpx;
+
+    .placeholder {
+      height: 30rpx;
+      background-color: #f4f4f4;
+      margin: 0 20rpx;
     }
-    .coupon-left {
-      flex: 1;
-      text-align: center;
-      .coupon-price {
-        font-size: 60rpx;
-        color: #ee1310;
-      }
+
+    .coupon-box {
+      height: 400rpx;
+      overflow-y: auto;
     }
-    .coupon-center {
-      flex: 4;
-      color: #ee1310;
-      .coupon-center-user {
+
+    .coupon {
+      height: 150rpx;
+      margin: 10rpx 20rpx;
+      background-color: #faeaea;
+      border: 2rpx solid #eb8f8f;
+      display: flex;
+      align-items: center;
+
+      .coupon-text {
+        color: #e53f3f;
         font-size: 30rpx;
-        font-weight: 600;
       }
-      .coupon-center-type {
-        font-size: 28rpx;
-        margin-top: 10rpx;
-      }
-    }
-    .coupon-right {
-      flex: 1.5;
-      .claimable {
-        width: 110rpx;
-        height: 55rpx;
-        background: #f39818;
-        border-radius: 10rpx;
-        color: #fff;
-        font-size: 26rpx;
-        line-height: 55rpx;
+
+      .coupon-left {
+        flex: 1;
         text-align: center;
+
+        .coupon-price {
+          font-size: 60rpx;
+          color: #ee1310;
+        }
       }
-      .claimable-content {
-        width: 160rpx;
-        height: 80rpx;
-        background-color: #de2d23;
-        font-size: 24rpx;
-        color: #fff;
-        border-radius: 10rpx;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        margin-right: 10rpx;
+
+      .coupon-center {
+        flex: 4;
+        color: #ee1310;
+
+        .coupon-center-user {
+          font-size: 30rpx;
+          font-weight: 600;
+        }
+
+        .coupon-center-type {
+          font-size: 28rpx;
+          margin-top: 10rpx;
+        }
+      }
+
+      .coupon-right {
+        flex: 1.5;
+
+        .claimable {
+          width: 110rpx;
+          height: 55rpx;
+          background: #f39818;
+          border-radius: 10rpx;
+          color: #fff;
+          font-size: 26rpx;
+          line-height: 55rpx;
+          text-align: center;
+        }
+
+        .claimable-content {
+          width: 160rpx;
+          height: 80rpx;
+          background-color: #de2d23;
+          font-size: 24rpx;
+          color: #fff;
+          border-radius: 10rpx;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          margin-right: 10rpx;
+        }
       }
     }
   }
-}
-// .coupon {
-//   height: 300rpx;
-//   display: flex;
-//   font-size: 32rpx;
-//   color: #f2110d;
-//   border-radius: 10rpx;
-//   margin-bottom: 25rpx;
-//   padding: 20rpx 25rpx;
-//   box-sizing: border-box;
-//   background-color: #faeaea;
-//   border: 2rpx solid #eb8b8b;
-
-//   .coupon-left {
-//     width: 10%;
-//     height: 100%;
-
-//     .coupon-left-price {
-//       font-size: 65rpx;
-//     }
-//   }
-
-//   .coupon-middle {
-//     flex-direction: column;
-//     justify-content: space-between;
-//     align-items: flex-start;
-//     width: 60%;
-//     height: 100%;
-
-//     .coupon-middle-user {
-//       width: 100%;
-//       font-size: 30rpx;
-//       font-weight: 600;
-//     }
-
-//     .coupon-middle-type {
-//       width: 100%;
-//       font-size: 24rpx;
-//       font-weight: 600;
-//       opacity: 0.8;
-//     }
-//   }
-
-//   .coupon-right {
-//     flex-direction: column;
-//     justify-content: space-between;
-//     align-items: flex-start;
-//     width: 25%;
-//     height: 100%;
-
-//     .coupon-right-time {
-//       height: 100%;
-//       flex-direction: column;
-//       justify-content: space-between;
-//       align-items: center;
-
-//       .tip {
-//         font-size: 30rpx;
-//         font-weight: 600;
-//       }
-
-//       .time {
-//         font-size: 24rpx;
-//         font-weight: 600;
-//         opacity: 0.8;
-//       }
-//     }
-
-//     .coupon-right-get {
-//       width: 80%;
-//       background-color: #e8a87c;
-//       height: 55rpx;
-//       text-align: center;
-//       line-height: 55rpx;
-//       margin-top: 15rpx;
-//     }
-//   }
-// }
-</style>
+
+  // .coupon {
+  //   height: 300rpx;
+  //   display: flex;
+  //   font-size: 32rpx;
+  //   color: #f2110d;
+  //   border-radius: 10rpx;
+  //   margin-bottom: 25rpx;
+  //   padding: 20rpx 25rpx;
+  //   box-sizing: border-box;
+  //   background-color: #faeaea;
+  //   border: 2rpx solid #eb8b8b;
+
+  //   .coupon-left {
+  //     width: 10%;
+  //     height: 100%;
+
+  //     .coupon-left-price {
+  //       font-size: 65rpx;
+  //     }
+  //   }
+
+  //   .coupon-middle {
+  //     flex-direction: column;
+  //     justify-content: space-between;
+  //     align-items: flex-start;
+  //     width: 60%;
+  //     height: 100%;
+
+  //     .coupon-middle-user {
+  //       width: 100%;
+  //       font-size: 30rpx;
+  //       font-weight: 600;
+  //     }
+
+  //     .coupon-middle-type {
+  //       width: 100%;
+  //       font-size: 24rpx;
+  //       font-weight: 600;
+  //       opacity: 0.8;
+  //     }
+  //   }
+
+  //   .coupon-right {
+  //     flex-direction: column;
+  //     justify-content: space-between;
+  //     align-items: flex-start;
+  //     width: 25%;
+  //     height: 100%;
+
+  //     .coupon-right-time {
+  //       height: 100%;
+  //       flex-direction: column;
+  //       justify-content: space-between;
+  //       align-items: center;
+
+  //       .tip {
+  //         font-size: 30rpx;
+  //         font-weight: 600;
+  //       }
+
+  //       .time {
+  //         font-size: 24rpx;
+  //         font-weight: 600;
+  //         opacity: 0.8;
+  //       }
+  //     }
+
+  //     .coupon-right-get {
+  //       width: 80%;
+  //       background-color: #e8a87c;
+  //       height: 55rpx;
+  //       text-align: center;
+  //       line-height: 55rpx;
+  //       margin-top: 15rpx;
+  //     }
+  //   }
+  // }
+</style>

src/pages/client/clientPackage/serviceDetail/index.vue

@@ -2,7 +2,7 @@
   <view class="service">
     <view class="service-content">
       <!-- 顶部 -->
-     <!-- <view class="flex" style="margin-top: 10rpx">
+      <!-- <view class="flex" style="margin-top: 10rpx">
         <view class="flex">
           <u-icon name="share-square" size="24" />
           <text style="font-size: 24rpx; color: #666">七仔美容</text>
@@ -13,8 +13,7 @@
       <!-- 标题和轮播图 -->
       <view>
         <view class="service-title">{{ goods.name }}</view>
-        <u-swiper :list="banners" previousMargin="30" nextMargin="30" circular  bgColor="#ffffff"
-          height="190" />
+        <u-swiper :list="banners" previousMargin="30" nextMargin="30" circular bgColor="#ffffff" height="190" />
       </view>
 
       <!-- 价格 -->
@@ -109,7 +108,16 @@
 </template>
 
 <script>
-  import { getGoodsDetailApi, addFavorite ,addShoppingCart , addGoodsFavorite , cancelFavorite , getGoodsConcentList } from '@/api/client/business.js';
+  import {
+    getGoodsDetailApi,
+    addFavorite,
+    addShoppingCart,
+    addGoodsFavorite,
+    cancelFavorite,
+    // getGoodsConcentList,
+    accountToOrderGetComment
+  } from '@/api/client/business.js';
+  import { accountTotIdGetConponList } from "@/api/client/mine.js"
   import GainCoupon from './GainCoupon.vue';
   import EvaluateContent from './EvaluateContent.vue';
   export default {
@@ -134,15 +142,15 @@
           fill: 'heart-fill',
         },
         goods: [], //商品详情
-        banners:[
+        banners: [
           'https://cdn.uviewui.com/uview/swiper/swiper3.png',
           'https://cdn.uviewui.com/uview/swiper/swiper2.png',
           'https://cdn.uviewui.com/uview/swiper/swiper1.png'
         ],
         coupons: [], //优惠券
         comments: [], // 评论
-        id: '',//商品id
-        shoopId:null,//店铺id
+        id: '', //商品id
+        shoopId: null, //店铺id
         show: false,
         detailList: [{
             id: '1',
@@ -164,7 +172,6 @@
       this.shoopId = option.shopId
       this.id = option.id;
       this.handlerInitList(option.id);
-      this.handlerGetGoodsConcentList()
     },
     methods: {
       openPopup() {
@@ -172,20 +179,32 @@
       },
       closeCoupon(data) {
         this.show = data;
+        this.handlerGetGoodsConcentList()
       },
       handlerInitList(id) {
         getGoodsDetailApi(id).then(res => {
+          console.log("@@@@res",res)
           this.goods = res.data.goods;
-          this.coupons = res.data.coupons;
           this.comments = res.data.comments;
+          this.handlerGetGoodsConcentList()
         });
       },
-      // 获取商品评价列表
-      handlerGetGoodsConcentList(){
-        getGoodsConcentList(this.id).then(res=>{
-          console.log('@@@@res',res)
+      handlerGetGoodsConcentList() {
+        // 获取商品评价列表
+        let params = {
+          // merchantId:this.shoopId,
+          goodsId:this.goods.id
+        }
+        accountToOrderGetComment(params).then(res => {
+          console.log("@@@@res",res)
+        })
+
+        // 根据id获取优惠券列表
+        accountTotIdGetConponList(this.shoopId,{ paging:'1,10' }).then(res=>{
+          this.coupons = res.data.records
         })
       },
+
       // 点击分享
       handlerShare() {
         uni.share({
@@ -216,7 +235,7 @@
       },
       // 点击收藏1
       handlerFavorite() {
-        if(this.goods.favorites){
+        if (this.goods.favorites) {
           cancelFavorite(this.id).then(res => {
             if (res.code == 200) {
               this.handlerInitList(this.id);
@@ -232,7 +251,7 @@
               return;
             }
           });
-        }else{
+        } else {
           addGoodsFavorite(this.id).then(res => {
             if (res.code == 200) {
               this.handlerInitList(this.id);
@@ -263,23 +282,23 @@
       handlerAddCart() {
         let params = {
           // id:this.shoopId,
-          goodsId:this.goods.id,
-          quantity:1,
-          price:this.goods.originalPrice,
-          goodsName:this.goods.name,
-          goodsPic:'@/static/QR57a.jpg',
-          goodsSubTitle:this.goods.description
+          goodsId: this.goods.id,
+          quantity: 1,
+          price: this.goods.originalPrice,
+          goodsName: this.goods.name,
+          goodsPic: '@/static/QR57a.jpg',
+          goodsSubTitle: this.goods.description
         }
-        addShoppingCart(params).then(res=>{
-          if(res.code == 200){
+        addShoppingCart(params).then(res => {
+          if (res.code == 200) {
             uni.showToast({
-              title:'购物车添加成功',
-              icon:'none'
+              title: '购物车添加成功',
+              icon: 'none'
             })
-          }else{
+          } else {
             uni.showToast({
-              title:res.message,
-              icon:'none'
+              title: res.message,
+              icon: 'none'
             })
             return
           }

src/pages/client/clientPackage/uptickOrder.vue

@@ -139,7 +139,7 @@
 </template>
 
 <script>
-  import { getShoppingCart ,generateOrder ,getCartList} from "@/api/client/business.js"
+  import { generateOrder ,getCartList} from "@/api/client/business.js"
   import { maintainCouponPaging } from "@/api/client/mine.js"
 	export default {
 		data() {

src/pages/client/clientUser/cart/index.vue

@@ -8,7 +8,8 @@
     <!-- <CartList :init_list.sync='init_list' :isAllSecect.sync='isAllSecect' @handlerIsSelectAll='handlerIsSelectAll'></CartList> -->
     <view class="item-box">
       <u-checkbox-group shape='circle' placement="column" v-model="goodsCheckbox">
-        <view class="item" v-for="(item,index) of init_list" :key='index'>
+        <shopCarItem />
+        <!-- <view class="item" v-for="(item,index) of init_list" :key='index'>
           <view class="item-l">
             <view class="l-l">
               <u-checkbox :name='item.goodsId'></u-checkbox>
@@ -25,7 +26,7 @@
           <view class="item-r">
             <u-number-box v-model="item.quantity" @change="valChange(item,$event)"></u-number-box>
           </view>
-        </view>
+        </view> -->
       </u-checkbox-group>
     </view>
 
@@ -71,7 +72,9 @@
     editGoodsNumb,
     generateConfirmOrder
   } from "@/api/client/business.js"
+  import shopCarItem from "@/components/shopCarItem/shopCarItem"
   export default {
+    components:{shopCarItem},
     data() {
       return {
         init_list: [],
@@ -80,7 +83,10 @@
         sumPrice: 0,
         instructionShow: false, // 底部优惠明细
 
-        manageShow: false
+        manageShow: false,
+        queryParams:{
+          paging:'1,10'
+        }
       }
     },
     onShow() {
@@ -115,9 +121,9 @@
       },
     },
     methods: {
-      // 初始化购物车列表1
+      // 初始化购物车列表
       handlerInitList() {
-        getShoppingCart().then(res => {
+        getShoppingCart(this.queryParams).then(res => {
           this.init_list = res.data
         })
       },

src/pages/client/clientUser/collectList.vue

@@ -14,7 +14,8 @@
       <view v-if="init_list.length > 0">
         <view class="text">以下是您收藏的商品服务</view>
         <!-- 收藏的服务 -->
-        <serviceItem :item="init_list" :skipType="1"></serviceItem>
+        <serviceItem v-if="indexs == 0" :item="init_list" ></serviceItem>
+        <goodsItem v-else :item="init_list"/>
       </view>
       <u-empty v-else mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" />
     </view>
@@ -23,8 +24,9 @@
 
 <script>
   import serviceItem from '@/components/service/index.vue';
+  import goodsItem from "@/components/service/goodsItem.vue"
   import {
-    maintainFavoritePaging
+    maintainFavoritePaging , getFavouriteGoods
   } from '@/api/client/mine.js';
   import {
     getCurrentLocation
@@ -32,7 +34,7 @@
 
   export default {
     components: {
-      serviceItem,
+      serviceItem,goodsItem
     },
     data() {
       return {
@@ -53,6 +55,7 @@
             name: '服务',
           },
         ],
+        indexs:0
       };
     },
     onLoad() {
@@ -83,7 +86,7 @@
         //   },
         // });
       },
-      // 初始化列表信息
+      // 初始化商家列表信息
       handlerInitList() {
         maintainFavoritePaging(this.queryParams).then(res => {
           if (res.code == 200 && res.data) {
@@ -98,8 +101,33 @@
           }
         });
       },
-
-      clickCollect(index) {},
+      // 初始化服务列表
+      handlerInitGoodsList(){
+        getFavouriteGoods().then(res => {
+          if (res.code == 200 && res.data) {
+            res.data.map(rs => {
+              this.init_list.push(rs.goods);
+            });
+          } else {
+            uni.showToast({
+              title: '数据请求失败',
+              icon: 'none',
+            });
+          }
+        });
+      },
+      clickCollect(e) {
+        this.init_list = []
+        this.indexs = e.index
+        switch(e.index){
+          case 0 :
+            this.handlerInitList()
+            break;
+          case 1 :
+            this.handlerInitGoodsList()
+          break;
+        }
+      },
     },
   };
 </script>

src/pages/client/clientUser/coupon.vue

@@ -2,52 +2,30 @@
   <view class="container">
     <!-- 顶部导航栏 -->
     <view class="top-tab">
-      <u-tabs
-        class="tab"
-        :list="list"
-        @click="handlerChangeTab1"
-        :activeStyle="{
+      <u-tabs class="tab" :list="list" @click="handlerChangeTab1" :activeStyle="{
           color: '#fff',
           fontWeight: 'bold',
           transform: 'scale(1.05)',
-        }"
-        :inactiveStyle="{
+        }" :inactiveStyle="{
           color: '#fff',
           transform: 'scale(1)',
-        }"
-        itemStyle="height: 34px; width:27%;"
-        lineColor="#D89A4C"
-      ></u-tabs>
+        }" itemStyle="height: 34px; width:27%;" lineColor="#D89A4C"></u-tabs>
     </view>
 
     <!-- 优惠券的可用和失效 -->
     <view class="use">
-      <u-tabs
-        :list="list2"
-        lineWidth="60"
-        lineColor="#347caf"
-        :scrollable="false"
-        :activeStyle="{
+      <u-tabs :list="list2" lineWidth="60" lineColor="#347caf" :scrollable="false" :activeStyle="{
           color: '#347caf',
           fontWeight: 'bold',
           transform: 'scale(1.05)',
-        }"
-        :inactiveStyle="{
+        }" :inactiveStyle="{
           color: '#b7b6b8',
           transform: 'scale(1)',
-        }"
-        itemStyle="padding-left: 90rpx; padding-right: 80rpx; height: 120rpx;"
-        @change="handlerSelectTab"
-      />
+        }" itemStyle="padding-left: 90rpx; padding-right: 80rpx; height: 120rpx;" @change="handlerSelectTab" />
     </view>
 
     <!-- 优惠券可用 -->
-    <view
-      class="couponUse"
-      v-show="lable_type == 0"
-      :key="index"
-      v-for="(item, index) of init_list"
-    >
+    <view class="couponUse" v-show="lable_type == 0" :key="index" v-for="(item, index) of init_list">
       <view class="useLeft">
         <view>{{ item.name }}</view>
         <text>2320-07-02 ~ {{ item.expiration }}</text>
@@ -65,151 +43,151 @@
 </template>
 
 <script>
-import { maintainCouponPaging } from '@/api/client/mine.js';
-export default {
-  data() {
-    return {
-      list: [
-        {
-          id: 1,
-          name: '满减',
-          type: 'REDUCE',
+  import {
+    getUserAcceptCouponsList
+  } from '@/api/client/mine.js';
+  export default {
+    data() {
+      return {
+        list: [{
+            id: 1,
+            name: '满减',
+            type: 'REDUCE',
+          },
+          {
+            id: 2,
+            name: '折扣',
+            type: 'DISCOUNT',
+          },
+          {
+            id: 3,
+            name: '赠送',
+            type: 'GIVE',
+          },
+        ],
+        list2: [{
+            name: '可用',
+            type: 'UNUSED',
+          },
+          {
+            name: '失效',
+            type: 'CLOSED',
+          },
+        ],
+        lable_type: 0, // 是否可用
+        queryParams: {
+          size: '10', //分页信息  取值范围: 页码,分页大小
+          type: 'GIVE', //优惠券类型 允许值: GIVE(赠送), REDUCE(满减), DISCOUNT(折扣)
+          status: 'UNUSED', // 用户优惠券状态 UNUSED(未使用), USED(已使用), EXPIRED(已过期), CLOSED(作废)
         },
-        {
-          id: 2,
-          name: '折扣',
-          type: 'DISCOUNT',
-        },
-        {
-          id: 3,
-          name: '赠送',
-          type: 'GIVE',
-        },
-      ],
-      list2: [
-        {
-          name: '可用',
-          type: 'UNUSED',
-        },
-        {
-          name: '失效',
-          type: 'CLOSED',
-        },
-      ],
-      lable_type: 0, // 是否可用
-      queryParams: {
-        paging: '1,10', //分页信息  取值范围: 页码,分页大小
-        type: 'GIVE', //优惠券类型 允许值: GIVE(赠送), REDUCE(满减), DISCOUNT(折扣)
-        status: 'UNUSED', // 用户优惠券状态 UNUSED(未使用), USED(已使用), EXPIRED(已过期), CLOSED(作废)
-      },
-      init_list: [], //初始化列表
-      total: 0,
-    };
-  },
-  mounted() {
-    this.handlerInitCouponList();
-  },
-  methods: {
-    // 初始化优惠卷列表
-    handlerInitCouponList() {
-      maintainCouponPaging(this.queryParams).then(res => {
-        this.init_list = res.data.records;
-        this.total = res.data.total;
-      });
+        init_list: [], //初始化列表
+        total: 0,
+      };
     },
-
-    // 选择顶部导航栏
-    handlerChangeTab1(e) {
-      this.queryParams.type = e.type;
+    mounted() {
       this.handlerInitCouponList();
     },
+    methods: {
+      // 初始化优惠卷列表
+      handlerInitCouponList() {
+        getUserAcceptCouponsList(this.queryParams).then(res => {
+          this.init_list = res.data.records;
+          this.total = res.data.total;
+        });
+      },
 
-    // 点击选择下层tab栏 选择是否可用
-    handlerSelectTab(e) {
-      this.lable_type = e.index;
-      this.queryParams.status = e.type;
-      this.handlerInitCouponList();
+      // 选择顶部导航栏
+      handlerChangeTab1(e) {
+        this.queryParams.type = e.type;
+        this.handlerInitCouponList();
+      },
+
+      // 点击选择下层tab栏 选择是否可用
+      handlerSelectTab(e) {
+        this.lable_type = e.index;
+        this.queryParams.status = e.type;
+        this.handlerInitCouponList();
+      },
     },
-  },
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.container {
-  height: 100vh;
-  background-color: #efefef;
-
-  .top-tab {
-    width: 100%;
-    background-color: #347caf;
-    padding: 20rpx 0;
-  }
-
-  .use {
-    padding: 0 140rpx;
-  }
+  .container {
+    height: 100vh;
+    background-color: #efefef;
 
-  /* 优惠券可用 */
-  .couponUse {
-    margin: 20rpx 30rpx;
-    height: 200rpx;
-    display: flex;
-    background-color: #fff;
-    box-sizing: border-box;
-
-    .useLeft {
-      width: 380rpx;
-      padding: 20rpx;
-
-      > view {
-        font-size: 40rpx;
-        margin: 20rpx;
-        color: #333;
-      }
+    .top-tab {
+      width: 100%;
+      background-color: #347caf;
+      padding: 20rpx 0;
+    }
 
-      > text {
-        font-size: 28rpx;
-        color: #5f5f5f;
-      }
+    .use {
+      padding: 0 140rpx;
     }
 
-    .useRight {
-      height: 100%;
-      padding: 10rpx;
-      color: #fff;
-      text-align: center;
+    /* 优惠券可用 */
+    .couponUse {
+      margin: 20rpx 30rpx;
+      height: 200rpx;
+      display: flex;
+      background-color: #fff;
       box-sizing: border-box;
-      width: calc(100% - 380rpx);
-      background-color: #347caf;
 
-      .text {
-        font-size: 50rpx;
+      .useLeft {
+        width: 380rpx;
+        padding: 20rpx;
 
-        > text {
-          margin-left: 5rpx;
-          font-size: 24rpx;
+        >view {
+          font-size: 40rpx;
+          margin: 20rpx;
+          color: #333;
+        }
+
+        >text {
+          font-size: 28rpx;
+          color: #5f5f5f;
         }
       }
 
-      .gouUse {
-        width: 180rpx;
-        height: 60rpx;
-        line-height: 60rpx;
-        color: #347caf;
-        margin: 16rpx 0 0 60rpx;
-        background-color: #fff;
+      .useRight {
+        height: 100%;
+        padding: 10rpx;
+        color: #fff;
+        text-align: center;
+        box-sizing: border-box;
+        width: calc(100% - 380rpx);
+        background-color: #347caf;
+
+        .text {
+          font-size: 50rpx;
+
+          >text {
+            margin-left: 5rpx;
+            font-size: 24rpx;
+          }
+        }
+
+        .gouUse {
+          width: 180rpx;
+          height: 60rpx;
+          line-height: 60rpx;
+          color: #347caf;
+          margin: 16rpx 0 0 60rpx;
+          background-color: #fff;
+        }
       }
     }
-  }
 
-  .couponDisUse {
-    .useRight {
-      background-color: #cecece;
+    .couponDisUse {
+      .useRight {
+        background-color: #cecece;
 
-      .gouUse {
-        color: #cecece;
+        .gouUse {
+          color: #cecece;
+        }
       }
     }
   }
-}
 </style>

src/pages/client/clientUser/myGroup.vue

@@ -38,10 +38,26 @@
 </template>
 
 <script>
+  import { getMyTeam } from "@/api/client/mine.js"
 export default {
   data() {
-    return {};
+    return {
+      queryParams:{
+        paging:'1,10'
+      }
+    };
+  },
+  mounted(){
+    this.handlerInitList()
   },
+  methods:{
+    // 初始化我的团队列表
+    handlerInitList(){
+      getMyTeam(this.queryParams).then(res=>{
+        console.log("Res",res)
+      })
+    }
+  }
 };
 </script>
 

src/pages/client/clientUser/serviceCenter.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="container">
-    <view class="title"> 常见问题 </view>
+<!--    <view class="title"> 常见问题 </view>
     <view class="item-box issue-box">
       <view class="item" :key="item" v-for="item of 4">
         <view class="item-l">
@@ -8,18 +8,20 @@
         </view>
         <view class="item-r"> 如何注销账户？ </view>
       </view>
-    </view>
-
-    <view class="title"> 热门问题 </view>
-    <view class="item-box hote-box">
-      <view class="item" :key="item" v-for="item of 4">
-        <view class="item-l">
-          <img class="img" src="@/static/logo.png" alt="" />
+    </view> -->
+    <view v-for='item of init_list'>
+      <view class="title"> {{ item.name }} </view>
+      <view class="item-box hote-box" >
+        <view class="item" v-for='(itm,idx) of item.helpList' @click='handlerSkipDetail(itm)'>
+          <view class="item-l">
+            <img class="img" src="@/static/logo.png" alt="" />
+          </view>
+          <view class="item-r"> {{ itm.title }} </view>
         </view>
-        <view class="item-r"> 如何注销账户？ </view>
       </view>
     </view>
 
+
     <view class="title"> 在线客服 </view>
     <view class="cust-box">
       <view class="item" :key="item" v-for="item of 3">
@@ -50,6 +52,7 @@
 </template>
 
 <script>
+  import { getProbleList } from "@/api/client/mine.js"
 export default {
   data() {
     return {
@@ -70,9 +73,22 @@ export default {
           text: '客服时间:周一至周五9:00-20:00',
         },
       ],
+      queryParams:{
+        paging:'1,10'
+      },
+      init_list:[]
     };
   },
+  mounted(){
+    this.handlerInitList()
+  },
   methods: {
+    handlerInitList(){
+      getProbleList(this.queryParams).then(res=>{
+        this.init_list = res.data
+        console.log("@@@@res",res)
+      })
+    },
     // 点击联系客服
     handlerCallService() {
       uni.showToast({
@@ -87,6 +103,13 @@ export default {
         icon: 'none',
       });
     },
+    // 跳转到问题详情
+    handlerSkipDetail(itm){
+      console.log("@@@@itm",itm)
+      uni.navigateTo({
+        url:`/pages/client/clientUser/serviceCenterDetail?itm=${JSON.stringify(itm)}`
+      })
+    }
   },
 };
 </script>

src/pages/client/clientUser/serviceCenterDetail.vue

@@ -0,0 +1,37 @@
+<template>
+  <view class="container">
+    <view class="title">
+      {{ init_list.title }}
+    </view>
+    <view class="content">
+      {{ init_list.content }}
+    </view>
+  </view>
+</template>
+
+<script>
+  export default{
+    data(){
+      return{
+        init_list:[]
+      }
+    },
+    onLoad(e){
+      this.init_list = e.itm
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .container{
+    padding: 20rpx;
+    .title{
+      font-size: 32rpx;
+      font-weight: bold;
+      text-align: center;
+    }
+    .content{
+      margin-top: 20rpx;
+    }
+  }
+</style>