From ad422e9466a8bfba6e03643fdff5e1e3419c25b5 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 30 Dec 2021 18:12:28 +0800
Subject: [PATCH] 首页，评价有礼

---
 packageB/pages/evaluate/evaluate.js   | 49 +++++++++++++++++++++++++++++++++++++++----------
 packageB/pages/evaluate/evaluate.wxml |  5 +++--
 pages/index/index/index.js            |  3 +--
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/packageB/pages/evaluate/evaluate.js b/packageB/pages/evaluate/evaluate.js
index bbc29d5..15f894b 100644
--- a/packageB/pages/evaluate/evaluate.js
+++ b/packageB/pages/evaluate/evaluate.js
@@ -26,6 +26,7 @@ Page({
 	is_act:0, //是否能购获取图片 
 	actId:0,   //活动ID
 	giftBagId:0, //礼包ID
+    ftype:0
 	
   },
   //点击星级
@@ -98,8 +99,19 @@ Page({
   
   //查询美导信息
   query_bea: function() {
-    var th = this;
-    var url = "/api/weshop/order/pagePosOrder";
+     var th = this;
+     var url = "/api/weshop/order/pagePosOrder";
+
+     switch (this.data.ftype){
+     	case 3:
+     		break;
+     	case 4:
+            url = "/api/weshop/serviceCard/pagePos";
+     		break;
+     	default:
+     	 	break
+     }
+
     var number = th.data.number; //订单编号
     getApp().request.promiseGet(url, {
       data: {
@@ -175,10 +187,10 @@ Page({
     var url = th.data.url + "/api/weshop/evaluation/evaluate/insert";
     var posNo = th.data.number; //收银单号
     var proposal = th.data.proposal; //用户建议内容
-    var fromType = th.data.fromType; //评价来源
+    var fromType = th.data.ftype?th.data.ftype:1; //评价来源
     var json = {
       "evaLabList": evaLabList,
-      "fromType": 1,
+      "fromType": fromType,
       "number": posNo,
       "remark": proposal,
       "star": stars + 1,
@@ -197,9 +209,15 @@ Page({
         if (res.data.code == 0) {
           getApp().my_warnning("评价成功", 1, th);
           var namber=th.data.number;
+
+          var url="/packageB/pages/evaluate_list/evaluate_list?IsEvaluate=1";
+          if(this.data.ftype==4){
+              url="/pages/user/index/index";
+          }
+
           setTimeout(function() {
             wx.redirectTo({
-              url: "/packageB/pages/evaluate_list/evaluate_list?IsEvaluate=1"
+              url: url
             });
           }, 2000);
         } else {
@@ -218,11 +236,17 @@ Page({
       number: options.number,
       //is_evaluate: options.evaluate
     })
+
+    if(options.fromtype){
+          this.setData({ftype:parseInt(options.fromtype)}) ;
+          if(options.fromtype==4) 	th.judge_act();
+    }
     //th.query_bea();
-	//th.judge_act();
+
 	var userinfo=getApp().globalData.userInfo;
 	console.log("userinfo",userinfo)
-	
+
+
 	if(!userinfo){
 		 getApp().goto("/pages/togoin/togoin");
 	}
@@ -260,9 +284,11 @@ Page({
       
         var id=this.data.actId;
         var gifbagid = this.data.gifbagid;   
-        console.log(id,"订单", this.data.number),
+        console.log(id,"订单", this.data.number);
+
+        var ty=this.data.ftype?this.data.ftype:2;
         wx.redirectTo({
-          url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType=2&orderNumber="+this.data.number
+          url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType="+ty+"&orderNumber="+this.data.number
         });
    
   },
@@ -271,10 +297,13 @@ Page({
   judge_act: function () {
     var th = this;
     var url = "/api/weshop/marketing/comment/act/judge";
+
+    var ty=this.data.ftype?this.data.ftype:2;
+
     getApp().request.promiseGet(url, {
       data: {
         orderNumber: th.data.number,
-        orderType: 2,
+        orderType: ty,
         storeId: a.stoid,
         userId: d.user_id
       }
diff --git a/packageB/pages/evaluate/evaluate.wxml b/packageB/pages/evaluate/evaluate.wxml
index ebfa0e5..97441c1 100644
--- a/packageB/pages/evaluate/evaluate.wxml
+++ b/packageB/pages/evaluate/evaluate.wxml
@@ -94,13 +94,14 @@
 </navigator>
 <view wx:else> 
 
-
+<block wx:if="{{ftype!=4}}">
   <view style="margin: auto;margin-bottom: 30rpx;" class="Submission flex-center" bindtap="evaluate_qt">
     <view>评价其他</view>
   </view>
   <view style="margin: auto;margin-bottom: 30rpx;" class="Submission flex-center" bindtap="evaluate_qt" data-status="1">
     <view>查看已评价的订单</view>
   </view>
+</block>
   
   <!-- 显示来个图标 -->
   <view class="show_icon" style="margin-top: 60rpx;">
@@ -133,7 +134,7 @@
 		<view class="title">商品详情</view>
 		<view style="padding: 0 20rpx;">
 			<view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{show_goods_list}}">
-				<view>{{item.WareName}}</view>
+				<view>{{item.WareName?item.WareName:item.ItemName}}</view>
 				<view>{{item.Qty}}</view>
 			</view>		
 		</view>
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 419e6b2..fa08260 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -97,7 +97,7 @@ Page({
       }else{
           var cache_scene= wx.setStorageSync('launch');
           //看一下有没有缓存，没有缓存，或者缓存的值不一样，就开始判断公众号关注组件
-          if(!cache_scene || cache_scene!=obj.scene){
+          if(!cache_scene){
               if (obj.scene === 1011 || obj.scene === 1012  || obj.scene === 1013 || obj.scene === 1017 ||
                   obj.scene === 1047 ||obj.scene === 1089 || obj.scene === 1038 || tt.scancode_time) {
                   this.setData({is_ok_h5:1})
@@ -108,7 +108,6 @@ Page({
               }
           }else{
               this.setData({is_ok_h5:0})
-              wx.setStorageSync('launch',0);
           }
 
       }
--
libgit2 0.21.4