diff --git a/components/diy_serviceCard/diy_serviceCard.wxss b/components/diy_serviceCard/diy_serviceCard.wxss
index bf5ddd8..3efe07d 100644
--- a/components/diy_serviceCard/diy_serviceCard.wxss
+++ b/components/diy_serviceCard/diy_serviceCard.wxss
@@ -240,11 +240,12 @@
 }
 
 .zs_t1_x {
+	position: absolute;
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 62rpx;
-  top: 6rpx;
+  /* position: relative; */
+  right: 10rpx;
+  top: 10rpx;
 }
 
 .zs_t1_x1 {
@@ -257,19 +258,21 @@
 }
 
 .zs_t1_x2 {
+	position: absolute;
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 56rpx;
-  top: 0rpx;
+  /* position: relative; */
+  right: 10rpx;
+  top: 10rpx;
 }
 
 .zs_t1_x3 {
+	position: absolute;
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 288rpx;
-  top: 234rpx;
+  /* position: relative; */
+  left: 10rpx;
+  bottom: 10rpx;
 }
 
 /*1列2个*/
diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js
index 7b73946..157b074 100644
--- a/packageA/pages/cart2_ser/cart2_ser.js
+++ b/packageA/pages/cart2_ser/cart2_ser.js
@@ -464,7 +464,6 @@ Page({
 						getApp().showWarning("未找到门店");
 						return false;
 					}
-
 					var goods = {
 						'card_id': gg.service_id,
 						'itemid': gg.erpItemID,
@@ -495,12 +494,12 @@ Page({
 				getApp().showWarning("未找到门店");
 				return false;
 			}
-
 			var goods = {
 				'card_id': th.data.bn_goods.id,
 				'itemid': th.data.bn_goods.erpItemID,
 				'qty': gg.goods_num,
-				'price': th.data.formData.order_amount,
+				'price': th.data.bn_goods.money,
+				// 'price': th.data.formData.order_amount,
 				'pickup_id': gg.pick_id,
 				'pickup_keyid': gg.keyid,
 			};
diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js
index 83d9784..94e7fd0 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.js
+++ b/packageA/pages/details_serviceCard/details_serviceCard.js
@@ -18,6 +18,11 @@ Page({
 	onLoad: function(options) {
 		self = this;
 		this.data.options = options;
+		
+		wx.setNavigationBarTitle({
+			title: '订单详情',
+		});
+		
 		app.isLogin().then(function(data) {
 			self.setData({
 				userInfo: data,
@@ -57,7 +62,7 @@ Page({
 					data: data,
 				}).then(res => {
 					if (res.data.code == 0) {
-						console.log('请求成功', res);
+						// console.log('请求成功', res);
 						this.setData({
 							details: res.data.data.pageData[0],
 						});
@@ -113,7 +118,7 @@ Page({
 
 	// 内容复制到剪贴板
 	copy() {
-		console.log('点击了复制按钮');
+		// console.log('点击了复制按钮');
 		wx.setClipboardData({
 			data: this.data.details.order_sn,
 			success(res) {
@@ -416,6 +421,7 @@ Page({
 	// 立即支付
 	pay() {
 		let order_sn = this.data.details.order_sn;
+		let order_id = this.data.details.order_id;
 		let store_id = app.globalData.setting.stoid;
 
 		app.request.post('/api/weshop/order/pay/createRechargeOrder', {
@@ -428,11 +434,11 @@ Page({
 				var n = res.data.data;
 				self.weixinPay(n, function() {
 					app.showWarning('支付成功');
-					// setTimeout(function() {
-					// 	wx.reLaunch({
-					// 		url: '/pages/user/my_service/i_service',
-					// 	})
-					// }, 1000)
+					setTimeout(function() {
+						wx.reLaunch({
+							url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
+						})
+					}, 1000)
 				}, function() {
 					app.showWarning('支付失败');
 					// setTimeout(function() {
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 9dc1000..db24d26 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -74,7 +74,7 @@ Page({
       name: "规格参数",
       id: 1
     }],
-    activeCategoryId3: 1,
+    activeCategoryId3: 1, // 点击评价-全部、有图、好评、中评时对应的id
     categories3: [{
       name: "全部",
       id: 1,
@@ -930,6 +930,7 @@ Page({
           user_id: s.globalData.user_id,
           store_id: o.stoid,
           add_time: timestamp,
+					type: 1,
         };
         //加入收藏夹就是导购的ID
         if(getApp().globalData.guide_id){
@@ -2513,6 +2514,7 @@ Page({
 	  var req_where = {
 	    store_id: o.stoid, pageSize: 5, is_show: 1,
 	    parent_id: 0, goods_id: th.data.gid, commenttype: tp,
+			service_id: this.data.gid,
 	  }
 	  if (getApp().globalData.userInfo) {
 	    req_where.userId = getApp().globalData.user_id;
@@ -2554,7 +2556,11 @@ Page({
 	      if (lines > 3) cda[ind].seeMore = true;
 	
 	      await getApp().request.promiseGet("/api/weshop/serviceComment/pageComment", {
-	        data: { store_id: o.stoid, parent_id: ep.comment_id }
+	        data: {
+						store_id: o.stoid,
+						parent_id: ep.comment_id,
+						service_id: this.data.gid,
+					}
 	      }).then(res => {
 	        if (res.data.data.pageData && res.data.data.pageData.length > 0) {
 	          cda[ind].replay_list = res.data.data.pageData;
@@ -2646,6 +2652,70 @@ Page({
 	  });
 	  this.requestComments_new();
 	},
+	
+	
+	//显示全部
+	toggleHandler: function (e) {
+	  var that = this,
+	    index = e.currentTarget.dataset.index;
+	  for (var i = 0; i < that.data.comments.length; i++) {
+	    if (index == i) {
+	      for (var i = 0; i < that.data.comments.length; i++) {
+	        that.data.comments[index].auto = true;
+	        that.data.comments[index].seeMore = false;
+	      }
+	    }
+	  }
+	  that.setData({
+	    comments: that.data.comments
+	  })
+	},
+	
+	//收起更多
+	toggleContent: function (e) {
+	  var that = this,
+	    index = e.currentTarget.dataset.index;
+	  for (var i = 0; i < that.data.comments.length; i++) {
+	    if (index == i) {
+	      that.data.comments[index].auto = true;
+	      that.data.comments[index].seeMore = true;
+	    }
+	  }
+	  that.setData({
+	    comments: that.data.comments
+	  })
+	},
+	
+	//--查看评价--
+	look_pj: function () {
+	  this.tabComment();
+	  this.doScrollTop();
+	},
+	
+	previewCommentImgs_w: function (t) {
+	  var e = this.data.comments[t.currentTarget.dataset.cidx].weapp_img;
+	  var b = e.slice()
+	  for (var i in b) {
+	    b[i] = this.data.iurl + e[i];
+	  }
+	  this.data.show_prew_img = 1;
+	  wx.previewImage({
+	    current: b[t.currentTarget.dataset.id],
+	    urls: b
+	  });
+	},
+	
+	previewGoodsCommentImgs: function (t) {
+	  var e = this,
+	    a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
+	  a = a.map(function (t) {
+	    return e.data.url + t;
+	  }), wx.previewImage({
+	    current: a[t.currentTarget.dataset.id],
+	    urls: a
+	  });
+	  this.data.show_prew_img = 1;
+	},
 	     
 
 
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index 8cfa058..37c250f 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -205,11 +205,11 @@
 					
 					<view wx:if="{{listServiceItem && listServiceItem.length > 0}}">
 						<view class="card fs28" wx:for="{{listServiceItem}}">
-							<view class="flex ai_c jc_sb">
-								<view class="ellipsis-1">{{item.projectName}}（{{item.frequency}}次）</view>
+							<view class="flex ai_c jc_sb" style="height: 88rpx;">
+								<view class="ellipsis-2">{{item.projectName}}（{{item.frequency}}次）</view>
 								<view class="pdl30">
-									<text class="rmb fs36 bold c-red pdr10">{{item.money}}</text>
-									<text class="line-del fs22 c-9">{{item.showPrice}}</text>
+										<text class="rmb fs36 bold c-red pdr10" wx:if="{{item.showPrice}}">{{item.showPrice}}</text>
+										<text class="line-del fs22 c-9" wx:if="{{item.vipPrice}}">{{item.vipPrice}}</text>
 								</view>
 							</view>
 							<view class="flex ai_c jc_sb fs24 c-6">
@@ -329,7 +329,7 @@
 			          </view>
 			        </view>
 			        <view class="xc-pirces">
-			          <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}">
+			          <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}" style="word-break: break-all;">
 			            {{item.content?item.content:'此用户没有填写评价。'}}
 			          </view>
 			        </view>
diff --git a/packageB/pages/user/add_comment/add_comment.js b/packageB/pages/user/add_comment/add_comment.js
index 13d5b01..3c50fb6 100644
--- a/packageB/pages/user/add_comment/add_comment.js
+++ b/packageB/pages/user/add_comment/add_comment.js
@@ -25,14 +25,45 @@ Page({
   },
   onLoad: async function (a) {
     var th = this;
-    await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", { data:{store_id:os.stoid,goods_id:a.goods_id, order_id:a.order_id}}).then(res => {
-
-      if(ut.ajax_ok(res)) {
-          a.img = th.data.iurl + res.data.data.pageData[0].original_img;
-          a.goods_name = res.data.data.pageData[0].goods_name;
-          a.goods_num = res.data.data.pageData[0].goods_num;
-      }
-    })
+		if(a.card == 1) {
+			wx.setNavigationBarTitle({
+				title: '评价卡项',
+			});
+			// console.log('card==1');
+			await getApp().request.promiseGet('/api/weshop/recharge/user/servicelist/list',{ 
+				data:{
+					store_id:os.stoid,
+					card_id:a.goods_id,
+					order_id:a.order_id,
+				},
+			}).then(res => {
+				// console.log('card===1', res.data);
+				if(res.data.code == 0) {
+					a.img = th.data.iurl + res.data.data[0].img_url;
+					a.goods_name = res.data.data[0].service_name;
+					a.goods_num = res.data.data[0].qty;
+				};
+			  // if(ut.ajax_ok(res)) {
+			  //     a.img = th.data.iurl + res.data.data.pageData[0].original_img;
+			  //     a.goods_name = res.data.data.pageData[0].goods_name;
+			  //     a.goods_num = res.data.data.pageData[0].goods_num;
+			  // }
+			});
+		} else {
+			wx.setNavigationBarTitle({
+				title: '评价宝贝',
+			});
+			// console.log('card==0');
+			await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", { data:{store_id:os.stoid,goods_id:a.goods_id, order_id:a.order_id}}).then(res => {
+			
+			  if(ut.ajax_ok(res)) {
+			      a.img = th.data.iurl + res.data.data.pageData[0].original_img;
+			      a.goods_name = res.data.data.pageData[0].goods_name;
+			      a.goods_num = res.data.data.pageData[0].goods_num;
+			  }
+			})
+		};
+    
     this.setData({ options: a });
     t.getUserInfo(function (e) {
       console.log(e);
@@ -64,9 +95,9 @@ Page({
     });
   },
   checkDeliverRank: function (t) {
-    this.setData({
-      deliver_rank: parseInt(t.currentTarget.dataset.i) + 1
-    });
+		this.setData({
+			deliver_rank: parseInt(t.currentTarget.dataset.i) + 1
+		});
   },
   selectPhotos: function (t) {
     if (this.data.isLongPress) this.data.isLongPress = !1; else {
@@ -88,8 +119,20 @@ Page({
   },
   submitComment: function (i) {
     var a = this;
-    if (!a.data.service_rank || !a.data.goods_rank || !a.data.deliver_rank)
-        return getApp().my_warnning("请先打分",0,a);
+		let url = '';
+		if(this.options.card == 1) {
+			this.setData({
+				deliver_rank: 5
+			});
+			if (!a.data.service_rank || !a.data.goods_rank)
+			    return getApp().my_warnning("请先打分",0,a);
+		} else {
+			if (!a.data.service_rank || !a.data.goods_rank || !a.data.deliver_rank)
+			    return getApp().my_warnning("请先打分",0,a);
+		};
+		
+		
+    
     // if(a.data.content=="")
     //   return getApp().my_warnning("请填写评价内容",0,a);
 
@@ -114,18 +157,26 @@ Page({
       if(a.data.is_anonymous){
         p_data['is_anonymous']=1;
       }
+			if(this.data.options.card == 1) {
+				// delete p_data.goods_id;
+				p_data['service_id'] = this.data.options.goods_id;
+				url = '/api/weshop/serviceComment/savecomment';
+			} else {
+				url = '/api/weshop/comment/savecomment';
+			};
+			
 
-      e.post("/api/weshop/comment/savecomment", {
+      e.post(url, {
         data:p_data,
-        success: function (a) {
-          if(a.data.code==0){
+        success: function (res) {
+          if(res.data.code==0){
           wx.setStorageSync("user:comment:update", !0), t.showSuccess("评论成功", function () {
             // wx.navigateBack();
             var url = i.currentTarget.dataset.url;
             getApp().goto(url);
           });
           }else{
-            getApp().my_warnning(a.data.msg,0,a);
+            getApp().my_warnning(res.data.msg,0,a);
           }
         }
       });
diff --git a/packageB/pages/user/add_comment/add_comment.json b/packageB/pages/user/add_comment/add_comment.json
index 401e4e6..034b0bf 100644
--- a/packageB/pages/user/add_comment/add_comment.json
+++ b/packageB/pages/user/add_comment/add_comment.json
@@ -1,5 +1,4 @@
 {
-    "navigationBarTitleText": "评价宝贝",
     "enablePullDownRefresh": false,
     "usingComponents": {
         "warn": "/components/long_warn/long_warn"
diff --git a/packageB/pages/user/add_comment/add_comment.wxml b/packageB/pages/user/add_comment/add_comment.wxml
index aecfbcd..910c2c3 100644
--- a/packageB/pages/user/add_comment/add_comment.wxml
+++ b/packageB/pages/user/add_comment/add_comment.wxml
@@ -30,7 +30,7 @@
 
     <!-- 商品评价信息 -->
     <view class="addComment">
-      <textarea class="fs24" placeholder="已经收到商品,快跟大家分享一下宝贝吧!" bindinput="txtInpt" placeholder-class="fs24" maxlength="500" value="{{content}}"></textarea>
+      <textarea class="fs24" placeholder="已经收到商品,快跟大家分享一下宝贝吧!" bindinput="txtInpt" placeholder-class="fs24" maxlength="500" value="{{content}}" />
       <view class="flex addimages">
         <!-- 评论图片集合 -->
         <view class="images">
@@ -74,8 +74,9 @@
           </view>
         </view>
       </view>
-
-      <view class="score-item flex-vertical">
+			<!-- 卡项订单不用给予物流服务评价 -->
+			<view class="score-item flex-vertical" wx:if="{{!options.card}}">
+      <!-- <view class="score-item flex-vertical"> -->
         <view class="fs24">物流服务</view>
         <view class="stars flex-vertical">
           <view class="flex-vertical" bindtap="checkDeliverRank" data-i="{{index}}" wx:for="{{5}}" wx:key="{{index}}">
@@ -106,7 +107,12 @@
   </view>
 
   <view class="Submission flex-level ">
-    <view class="fs30 flex-level white " bindtap="submitComment" data-url="/packageB/pages/user/view_comment/view_comment?goods_id={{goods_id}}&order_id={{order_id}}">提交评价</view>
+		<block>
+			<!-- 卡项订单 -->
+			<view class="fs30 flex-level white " bindtap="submitComment" data-url="/packageB/pages/user/view_comment/view_comment?card=1&goods_id={{options.goods_id}}&order_id={{order_id}}" wx:if="{{options.card == 1}}">提交评价</view>
+			<!-- 其他订单 -->
+			<view class="fs30 flex-level white " bindtap="submitComment" data-url="/packageB/pages/user/view_comment/view_comment?goods_id={{goods_id}}&order_id={{order_id}}" wx:else>提交评价</view>
+		</block>
   </view>
 </view>
 
diff --git a/packageB/pages/user/comment/comment.js b/packageB/pages/user/comment/comment.js
index 06b7766..a7438ba 100644
--- a/packageB/pages/user/comment/comment.js
+++ b/packageB/pages/user/comment/comment.js
@@ -12,6 +12,8 @@ var t = function(t) {
   os = e.globalData.setting;
 var regeneratorRuntime = require('../../../../utils/runtime.js');
 
+
+
 Page({
   data: {
     url: e.globalData.setting.url,
@@ -28,24 +30,29 @@ Page({
       status: 1
     }],
     activeStatus: 0,
-    comments: null,
+    comments: [],
     currentPage: 1,
     isloaded: 0,
     order_id:0,
     is_no_more:0,
   },
+	
   onLoad: function(t) {
     var e = void 0 === t.status ? this.data.activeStatus : t.status;
     this.data.order_id=t.order_id;
-
+		this.setData({
+			options: t,
+		});
     //a.init(this, "", "comments"),
     //this.requestComments(e);
     this.requestComments_new(e);
   },
+	
   onShow: function() {
     wx.getStorageSync("user:comment:update") && (wx.setStorageSync("user:comment:update", !1),
       this.resetData(), this.requestComments_new(this.data.activeStatus));
   },
+	
   changeTab: function(t) {
     var e = this;
     if (this.data.activeStatus == t.currentTarget.dataset.status)
@@ -54,23 +61,34 @@ Page({
   },
 
   requestComments_new:async function(t){
-        var e = this, th = e, n = os.url + "/api/weshop/comment/list?page=" + e.data.currentPage;
+        var e = this, th = e;
+				let n = '';
+				if(this.data.options.card == 1) { // 卡项订单
+					n = os.url + '/api/weshop/serviceComment/list?page=' + this.data.currentPage;
+				} else {
+					n = os.url + '/api/weshop/comment/list?page=' + this.data.currentPage;
+				};
+				
         this.setData({
-            activeStatus: t
+            activeStatus: t, // t为tabIndex
         });
 
-        if(e.data.order_id) n+="&order_id="+e.data.order_id;
+        if(this.data.order_id) n+="&order_id="+e.data.order_id;
         var rq_data={store_id: os.stoid, user_id: oo.user_id};
         if (t!= 2) {rq_data['is_comment']=t;}
 
         var rs_data=null,com_data=this.data.comments;
         await getApp().request.promiseGet(n,{data:rq_data}).then(res=>{
-            e.data.currentPage++
+            e.data.currentPage++;
             if(res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
                 rs_data=res.data.data.pageData;
             }else{
-                th.setData({ is_no_more: 1, })
-            }
+                th.setData({is_no_more: 1, comments: null});
+            };
+						if(res.data.data && res.data.data.total <= res.data.data.pageSize) {
+							// console.log('res======>>>', res.data.data);
+							th.setData({ is_no_more: 1, });
+						};
         })
 
         if(rs_data){
@@ -94,7 +112,7 @@ Page({
             th.setData({ comments: com_data })		
         }
 		
-		th.setData({isloaded: 1,})
+		th.setData({isloaded: 1,});
     },
 
   onReachBottom: function() {
@@ -130,6 +148,7 @@ Page({
     _errObj[_errImg] = os.imghost + "/public/images/default_goods_image_240.gif";
     th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;  
   },
+	
   //预览图片
   previewImg: function(e) {
     var index = e.currentTarget.dataset.index;
diff --git a/packageB/pages/user/comment/comment.wxml b/packageB/pages/user/comment/comment.wxml
index b3d3e2f..ec7dda5 100644
--- a/packageB/pages/user/comment/comment.wxml
+++ b/packageB/pages/user/comment/comment.wxml
@@ -1,14 +1,15 @@
 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
 <view class="container">
+	<!-- tabbar -->
   <view class="type-navbar padding">
     <view class="type-box fs28 type-navbar-item {{activeStatus==item.status?'type-item-on':''}}" data-status="{{item.status}}" wx:for="{{categories}}" wx:key="{{index}}">
       <view class="title_width" bindtap="changeTab" data-status="{{item.status}}">{{item.name}}</view>
     </view>
-
   </view>
 
   <!-- 无评价 -->
-  <view class="noCollection" wx:if="{{(!comments||comments.length==0) && isloaded}}">
+	<!-- <view class="noCollection" wx:if="{{(!comments||comments.length==0) && isloaded}}"> -->
+  <view class="noCollection" wx:if="{{!comments}}" data-c="{{comments}}">
     <view class="flex-level">
       <image src="{{iurl}}/miniapp/images/comment.png"></image>
     </view>
@@ -21,41 +22,44 @@
   </view>
 
   <!-- 待评价栏 -->
-  <view class="stay_evaluate" wx:if="{{comments.length>0}}" wx:for="{{comments}}">
-
+  <view class="stay_evaluate" wx:if="{{comments && comments.length>0}}" wx:for="{{comments}}">
     <!-- 商品编号和状态 -->
     <view class="Commodity_number flex-vertical-between fs26 padding border_bottom">
       <!--商品编号 -->
-      <view>订单编号：{{item.order_sn}}</view>
+			<block>
+				<!-- 卡项订单 -->
+				<view wx:if="{{options.card == 1}}">订单编号：{{item.service_sn}}</view>
+				<view wx:else>订单编号：{{item.order_sn}}</view>
+			</block>
       <!-- 商品评价状态 -->
       <view class="xc-wc">{{item.comment_id>0?'已评价':'待评价'}}</view>
     </view>
 
-    <!-- 商品详情集合 -->
-    <view class="detail_commoditys">
+    <!-- 商品详情集合 - 卡项订单 -->
+    <view class="detail_commoditys" wx:if="{{options.card == 1}}">
       <!-- 单个商品 -->
       <view>
-        <navigator class="detail_commodity flex-vertical padding border_bottom" url="{{'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id}}">
+        <navigator class="detail_commodity flex-vertical padding border_bottom" url="{{'/packageA/pages/goodsInfo/goodsInfo?goods_id='+item.goods_id}}">
           <!-- 商品图片 -->
-          <image src="{{item.original_img}}" binderror="bind_bnerr2" data-errorimg="comments[{{index}}].original_img"></image>
+          <image src="{{iurl + item.img_url}}" binderror="bind_bnerr2" data-errorimg="comments[{{index}}].original_img"></image>
           <!-- 商品内容 -->
           <view class="Commodity_content">
             <view class="Commodity_goods">
               <!-- 商品名称 -->
-              <view class="goods_name ellipsis-2 fs26">{{item.goods_name}}</view>
+              <view class="goods_name ellipsis-2 fs26">{{item.service_name}}</view>
               <!-- 商品规格 -->
-              <view class="Commodity_spec fs20">
+              <!-- <view class="Commodity_spec fs20">
                 <view class="flex-center">{{item.goods_color+item.goods_spec.length>-1?item.goods_color+item.goods_spec:'规格1'}}</view>
-              </view>
+              </view> -->
             </view>
             <!-- 商品价格数量 -->
             <view class="Commodity_money flex-vertical-between baseline">
               <!-- 商品价格 -->
               <view class="flex-vertical xc-wc baseline">
                 <view class="fs20">￥</view>
-                <view class="fs30">{{filter.toFix(item.goods_price,2)}}</view>
+                <view class="fs30">{{filter.toFix(item.price,2)}}</view>
               </view>
-              <view class="fs26">x{{item.goods_num}}</view>
+              <view class="fs26">x{{item.qty}}</view>
 
             </view>
           </view>
@@ -72,9 +76,7 @@
           <!-- 评价内容 -->
           <view class="Comment_content ellipsis-2 fs24">{{item.content.length>0?item.content:'此用户没有填写评论'}}</view>
           <view class="Comment_images flex">
-            <image wx:if="{{item.source_type==0  && aitem.length>10}}" data-index="{{index}}" src="{{iurl+aitem}}" wx:for="{{item.img}}" wx:for-item="aitem" wx:for-index="i" data-sindex="{{i}}" data-name="img"></image>
-            <image wx:if="{{item.source_type==1 && aitem.length>10}}" src="{{iurl+aitem}}" wx:for-index="i" data-index="{{index}}" wx:for="{{item.weapp_img}}" wx:for-item="aitem" data-sindex="{{i}}" data-name="weapp_img"></image>
-
+            <image src="{{aitem}}" wx:for-index="i" data-index="{{index}}" wx:for="{{item.weapp_img}}" wx:for-item="aitem" data-sindex="{{i}}" data-name="weapp_img"></image>
           </view>
 
           <!-- 商家回复 -->
@@ -95,31 +97,122 @@
       <view class="commodity_evaluate flex jc_sb padding baseline fs26">
         <!-- 商品数量 -->
         <view class="commodity_smy flex">
-          <view>共{{item.goods_num}}件商品</view>
+          <view>共{{item.qty}}件商品</view>
           <!-- 商品总价格 -->
           <view class="flex commodity_money">
             <view>合计:</view>
             <view class="flex baseline xc-wc">
               <view class="fs24">￥</view>
-              <view>{{filter.toFix(item.goods_price,2)}}</view>
+              <view>{{filter.toFix(item.price,2)}}</view>
             </view>
           </view>
         </view>
         <view class="flex">
-          <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level View_evaluation fs24" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">
+          <!-- <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level View_evaluation fs24" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">
             <view>查看订单</view>
-          </navigator>
+          </navigator> -->
 
-          <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level comment_go" url="/packageB/pages/user/view_comment/view_comment?goods_id={{item.goods_id}}&order_id={{item.order_id}}">
+          <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level comment_go" url="/packageB/pages/user/view_comment/view_comment?card=1&goods_id={{item.card_id}}&order_id={{item.order_id}}">
             <view>查看评价</view>
           </navigator>
 
-          <navigator wx:if="{{!item.comment_id}}" bindtap="comment" data-recid="{{item.rec_id}}" class="commodity_To_evaluate flex-level comment_go" url="{{item.comment_id>0?'/packageB/pages/user/add_comment/add_comment?goods_id={{item.goods_id}}&order_id={{item.order_id}}':''}}">
+          <navigator wx:if="{{!item.comment_id}}" bindtap="comment" data-recid="{{item.rec_id}}" class="commodity_To_evaluate flex-level comment_go" url="/packageB/pages/user/add_comment/add_comment?card=1&goods_id={{item.card_id}}&order_id={{item.order_id}}&price={{item.price}}">
             <view class="fs24">去评价</view>
           </navigator>
         </view>
       </view>
     </view>
+		
+		<!-- 商品详情集合 -->
+		<view class="detail_commoditys" wx:else>
+		  <!-- 单个商品 -->
+		  <view>
+		    <navigator class="detail_commodity flex-vertical padding border_bottom" url="{{'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id}}">
+		      <!-- 商品图片 -->
+		      <image src="{{item.original_img}}" binderror="bind_bnerr2" data-errorimg="comments[{{index}}].original_img"></image>
+		      <!-- 商品内容 -->
+		      <view class="Commodity_content">
+		        <view class="Commodity_goods">
+		          <!-- 商品名称 -->
+		          <view class="goods_name ellipsis-2 fs26">{{item.goods_name}}</view>
+		          <!-- 商品规格 -->
+		          <view class="Commodity_spec fs20">
+		            <view class="flex-center">{{item.goods_color+item.goods_spec.length>-1?item.goods_color+item.goods_spec:'规格1'}}</view>
+		          </view>
+		        </view>
+		        <!-- 商品价格数量 -->
+		        <view class="Commodity_money flex-vertical-between baseline">
+		          <!-- 商品价格 -->
+		          <view class="flex-vertical xc-wc baseline">
+		            <view class="fs20">￥</view>
+		            <view class="fs30">{{filter.toFix(item.goods_price,2)}}</view>
+		          </view>
+		          <view class="fs26">x{{item.goods_num}}</view>
+		
+		        </view>
+		      </view>
+		    </navigator>
+		    <!-- 评论信息 -->
+		    <view class="Commodity_evaluation padding border_bottom" wx:if="{{item.comment_id>0}}">
+		      <!-- 评价星级 -->
+		      <view class="starss flex fs26">
+		        <view class="commen">评价：</view>
+		        <view class="stars">
+		          <image src="{{imaitem>=item.deliver_rank?iurl+'/miniapp/images/StarswhiteUnCk.png':iurl+'/miniapp/images/StarsredCk.png'}}" data-ind="{{imaitem}}" data-oo="{{item.deliver_rank}}" wx:for="{{5}}" wx:for-index="imaitem" wx:for-item="{{item_start}}"></image>
+		        </view>
+		      </view>
+		      <!-- 评价内容 -->
+		      <view class="Comment_content ellipsis-2 fs24">{{item.content.length>0?item.content:'此用户没有填写评论'}}</view>
+		      <view class="Comment_images flex">
+							<image wx:if="{{item.source_type==0  && aitem.length>10}}" data-index="{{index}}" src="{{iurl+aitem}}" wx:for="{{item.img}}" wx:for-item="aitem" wx:for-index="i" data-sindex="{{i}}" data-name="img"></image>
+							<image wx:if="{{item.source_type==1 && aitem.length>10}}" src="{{iurl+aitem}}" wx:for-index="i" data-index="{{index}}" wx:for="{{item.weapp_img}}" wx:for-item="aitem" data-sindex="{{i}}" data-name="weapp_img"></image>
+
+		      </view>
+		
+		      <!-- 商家回复 -->
+		      <view class="reply rel" wx:if="{{item.replay_list}}">
+		        <view class="line_bulge"></view>
+		        <view class="shop-reply fs26">店家回复: </view>
+		        <view class="shop-font fs24" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="{{index}}">
+		          {{r_item.content}}
+		        </view>
+		      </view>
+		
+		
+		      <!-- 评价时间 -->
+		      <view class="fs24 xc-ash comment_addtime flex-vertical">{{item.comment_addtime}}</view>
+		    </view>
+		  </view>
+		  <!-- 去评价 -->
+		  <view class="commodity_evaluate flex jc_sb padding baseline fs26">
+		    <!-- 商品数量 -->
+		    <view class="commodity_smy flex">
+		      <view>共{{item.goods_num}}件商品</view>
+		      <!-- 商品总价格 -->
+		      <view class="flex commodity_money">
+		        <view>合计:</view>
+		        <view class="flex baseline xc-wc">
+		          <view class="fs24">￥</view>
+		          <view>{{filter.toFix(item.goods_price,2)}}</view>
+		        </view>
+		      </view>
+		    </view>
+		    <view class="flex">
+		      <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level View_evaluation fs24" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">
+		        <view>查看订单</view>
+		      </navigator>
+		
+		      <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level comment_go" url="/packageB/pages/user/view_comment/view_comment?goods_id={{item.goods_id}}&order_id={{item.order_id}}">
+		        <view>查看评价</view>
+		      </navigator>
+		
+		      <navigator wx:if="{{!item.comment_id}}" bindtap="comment" data-recid="{{item.rec_id}}" class="commodity_To_evaluate flex-level comment_go" url="{{item.comment_id>0?'/packageB/pages/user/add_comment/add_comment?goods_id={{item.goods_id}}&order_id={{item.order_id}}':''}}">
+		        <view class="fs24">去评价</view>
+		      </navigator>
+		    </view>
+		  </view>
+		</view>
+		
   </view>
 
   <view class="get_bottom fs26" wx:if="{{comments.length>0 && is_no_more}}">已经加载到底部</view>
diff --git a/packageB/pages/user/view_comment/view_comment.js b/packageB/pages/user/view_comment/view_comment.js
index 0764c07..5fbe9b0 100644
--- a/packageB/pages/user/view_comment/view_comment.js
+++ b/packageB/pages/user/view_comment/view_comment.js
@@ -28,7 +28,8 @@ Page({
     var th = this;
     th.setData({
       goods_id: options.goods_id,
-      order_id: options.order_id
+      order_id: options.order_id,
+			options: options,
     })
     th.query_comment();
   },
@@ -41,10 +42,17 @@ Page({
   },
   query_comment: function() {
     var th = this;
+		let url = '';
     wx.showLoading({
       title: '加载中'
     })
-    var url = "/api/weshop/comment/list";
+		
+		if(this.data.options.card == 1) { // 卡项订单
+			url = `/api/weshop/serviceComment/list?card_id=${this.data.goods_id}`;
+		} else {
+			url = '/api/weshop/comment/list';
+		}
+
     getApp().request.promiseGet(url, {
       data: {
         store_id: a.stoid,
diff --git a/packageB/pages/user/view_comment/view_comment.wxml b/packageB/pages/user/view_comment/view_comment.wxml
index c74b53f..82bf871 100644
--- a/packageB/pages/user/view_comment/view_comment.wxml
+++ b/packageB/pages/user/view_comment/view_comment.wxml
@@ -1,12 +1,40 @@
 <view class="commoditymax" wx:for="{{comment}}" wx:if="{{index==0}}" wx:for-item="item">
   <!-- 商品评价 -->
   <view class='commodity'>
-    <!-- 商品信息 -->
-    <navigator class='information flex-vertical' url="{{'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id}}">
+		<!-- 卡项 -->
+		<navigator class='information flex-vertical' url="{{'/packageA/pages/goodsInfo/goodsInfo?goods_id='+options.goods_id}}" wx:if="{{options.card == 1}}">
+		  <image src="{{iurl+item.img_url}}" binderror="bind_bnerr2" data-errorimg="item.img_url"></image>
+		  <view class="goods_name xc-black">
+		    <!-- 商品名称 -->
+				<view class='ellipsis-2 fs32'>{{item.service_name}}</view>
+		    
+		    <!-- 商品价格，数量 -->
+		    <view class='flex jc_sb balin'>
+		      <!-- 价格 -->
+		      <view class='flex-vertical balin'>
+		        <view class="fs24">￥</view>
+						<view class="fs35">{{item.price}}</view>
+		      </view>
+		
+		      <!-- 商品数量 -->
+		      <view class='sum flex-vertical balin xc-black'>
+		        <view class="fs24">x</view>
+						<view class="fs28">{{item.qty}}</view>
+		      </view>
+		
+		    </view>
+		
+		  </view>
+		
+		</navigator>
+		
+    <!-- 其他商品 -->
+    <navigator class='information flex-vertical' url="{{'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id}}" wx:else>
       <image src="{{iurl+item.original_img}}" binderror="bind_bnerr2" data-errorimg="item.original_img"></image>
       <view class="goods_name xc-black">
         <!-- 商品名称 -->
-        <view class='ellipsis-2 fs32'>{{item.goods_name}}</view>
+				<view class='ellipsis-2 fs32'>{{item.goods_name}}</view>
+        
         <!-- 商品价格，数量 -->
         <view class='flex jc_sb balin'>
           <!-- 价格 -->
@@ -35,8 +63,16 @@
         <!-- 评论图片集合 -->
         <view class="images">
           <block wx:if="{{item.weapp_img!=''}}">
-            <image class="rel" catchtap="previewImg" data-index="{{index}}" src="{{iurl+item}}" wx:for="{{item.weapp_img}}" lazy-load="true">
-            </image>
+						<!-- 卡项 -->
+						<block wx:if="{{options.card == 1}}" >
+							<image class="rel" catchtap="previewImg" data-index="{{index}}" src="{{item}}" wx:for="{{item.weapp_img}}" lazy-load="true"></image>
+						</block>
+						
+						<!-- 其他商品 -->
+						<block wx:else>
+							<image class="rel" catchtap="previewImg" data-index="{{index}}" src="{{iurl+item}}" wx:for="{{item.weapp_img}}" lazy-load="true"></image>
+						</block>
+						
           </block>
           <block wx:else>
             <image wx:if="{{item.img!=''}}" class="rel" catchtap="previewImg" data-index="{{index}}" src="{{iurl+item}}" wx:for="{{item.img}}" lazy-load="true">
@@ -68,7 +104,7 @@
         </view>
       </view>
 
-      <view class="score-item flex-vertical">
+      <view class="score-item flex-vertical" wx:if="{{!options.card}}">
         <view class="fs24">物流服务</view>
         <view class="stars flex-vertical">
           <view class="flex-vertical" wx:for="{{5}}" wx:for-item="deliver" wx:for-index="deliver">
@@ -91,14 +127,17 @@
   </view>
 </view>
 <!-- 是否匿名评价 -->
-<view class="Whether" wx:if="{{comment.length>0}}">
-  <view class="Submission flex-level ">
-    <view class="fs30 flex-level white " bindtap="goto" data-url="/packageB/pages/user/comment/comment">评价其他</view>
-  </view>
-  <view class="flex-level" wx:if="{{is_act}}">
-    <view class="fs30 flex-level white receive" data-url="/pages/giftpack/evaluategift/evaluategift?actId={{actId}}&orderNumber={{order_id}}&orderGoodsId={{goods_id}}&giftBagId={{giftBagId}}" bindtap="goto">点击领取礼品</view>
-  </view>
-</view>
+<block wx:if="{{!options.card}}">
+	<view class="Whether" wx:if="{{comment.length>0}}">
+	  <view class="Submission flex-level ">
+	    <view class="fs30 flex-level white " bindtap="goto" data-url="/packageB/pages/user/comment/comment">评价其他</view>
+	  </view>
+	  <view class="flex-level" wx:if="{{is_act}}">
+	    <view class="fs30 flex-level white receive" data-url="/pages/giftpack/evaluategift/evaluategift?actId={{actId}}&orderNumber={{order_id}}&orderGoodsId={{goods_id}}&giftBagId={{giftBagId}}" bindtap="goto">点击领取礼品</view>
+	  </view>
+	</view>
+</block>
+
 
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
diff --git a/packageB/pages/user/view_comment/view_comment.wxss b/packageB/pages/user/view_comment/view_comment.wxss
index ed974d5..478fca3 100644
--- a/packageB/pages/user/view_comment/view_comment.wxss
+++ b/packageB/pages/user/view_comment/view_comment.wxss
@@ -69,11 +69,12 @@ page{
   margin-bottom: 15rpx;
 }
 .comment{
-   overflow: hidden;
+	word-break: break-all;
+  /* overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
+  -webkit-line-clamp: 3; */
 }
 .addComment .addimages .images {
   height: 140rpx;