3.30提交

pages_app/myPatient/myPatient.vue

@@ -23,8 +23,8 @@
 						<view class="request-text">{{ item.content }}</view>
 						
 						<view class="action-buttons">
-							<button class="reject-btn" @click="applyListOperate(item.uuid,3)">拒绝</button>
+							<button class="reject-btn" @click="applyListOperate(item.uuid,3,item.content,item.patientUuid)">拒绝</button>
-							<button class="agree-btn" @click="applyListOperate(item.uuid,2,item.content)">同意</button>
+							<button class="agree-btn" @click="applyListOperate(item.uuid,2,item.content,item.patientUuid)">同意</button>
 						</view>
 					</view>
 				</view>
@@ -172,7 +172,7 @@ const getApplyList = async () => {		// 申请列表
 			});
 		}
 	};
-	const applyListOperate = async (uuid,status,content) => {
+	const applyListOperate = async (uuid,status,content,patientUuid) => {
 		let data = {
 			uuid: uuid,
 			status: status
@@ -190,7 +190,7 @@ const getApplyList = async () => {		// 申请列表
 		 getRelationRecordLately();
 		 if(status == 2){
 			navTo({
-				url: `/pages_app/patientRemark/patientRemark?uuid=${uuid}&&nickname=${nickname}`
+				url: `/pages_app/patientRemark/patientRemark?uuid=${patientUuid}&&nickname=${nickname}`
 			})
 		 }
 		}

pages_app/pptDetail/pptDetail.vue

@@ -1198,7 +1198,7 @@ const downloadGanDanFile = (type) => {
         resource_name:shareTitle.value,
         resource_option: tags.value,
         event_val:event_val,
-        event_unit:'',
+        event_unit:'分',
         number:1,
       },
     },
@@ -1354,19 +1354,7 @@ const ganDanFileDetials = async (flag = false) => {
   });
   if (res.code == 200) {
     tags.value = res.data.tags?res.data.tags:'';
-     if(flag){
+     
-      uni.sendNativeEvent("portraitReport",{
-      msg:{
-        event_nickname: "detail_page",
-        page_type: "肝胆课件",
-        resource_name:res.data.name,
-        resource_option: tags.value,
-      },
-    },
-    (ret) => {
-      console.log(ret);
-    });
-     }
      orderInfo.value = res.data;
      // 设置分享文案
      shareTitle.value = res.data.name;
@@ -1378,7 +1366,23 @@ const ganDanFileDetials = async (flag = false) => {
     order.value = res.data.order;
     let money = res.data.price/ 100;
     price.value = money > 1 ? money.toFixed(1) : money.toFixed(2);
+    if(flag){
+         try {
+          uni.sendNativeEvent("portraitReport",{
+      msg:{
+        event_nickname: "detail_page",
+        page_type: "肝胆课件",
+        resource_name:res.data.name,
+        resource_option: tags.value,
+      },
+    },
+    (ret) => {
+      console.log(ret);
+    });
+         } catch (error) {
           
+         }
+     }
     downloadTasks.value.forEach(item => {
       if (item.id == uuid.value) {
             uni.getSavedFileInfo({

pages_app/videoDetail/videoDetail.vue

@@ -1081,7 +1081,7 @@ const payVideoDownload = async () => {
         resource_option:tags.value?tags.value:'',
         event_unit:'积分',
         number:1,
-        event_val:0,
+        event_val:videoInfo.value.point,
       },
     },
     (ret) => {

pages_app/visit/visit.vue

@@ -7,9 +7,7 @@
 			left-icon="left"
 			title="添加随访计划"
 			@clickLeft="goBack"
-			
 			color="#8B2316"
-			
 			:border="false"
 			backgroundColor="#eee"
 		>

pages_goods/exchange/address.vue

@@ -215,6 +215,7 @@ onLoad((opts) => {
 	goodsNum.value = opts.goodsNum;
 	type.value = opts.type;
 	goodsName.value = opts.goodsName;
+	goodsPoints.value = opts.goodsPoints;
 	getAddress()
 })
 const saveAddress = () => {
@@ -271,7 +272,7 @@ const submit = () => {
         event_nickname: "boint_jifengood",
         page_type: "积分商城",
 		resource_name:goodsName.value,
-		event_val:0,
+		event_val:goodsPoints.value,
 		event_unit:'积分',
 		number:goodsNum.value,
 		belong:belong,

pages_goods/exchange/index.vue

@@ -146,7 +146,7 @@ const goAddress = () => {
 		freeVisible.value = true
 	}else{
 		uni.navigateTo({ 
-		url: '/pages_goods/exchange/address?goodsUuid='+id.value+'&type='+type.value+'&goodsNum='+qty.value+'&goodsName='+title.value
+		url: '/pages_goods/exchange/address?goodsUuid='+id.value+'&type='+type.value+'&goodsNum='+qty.value+'&goodsName='+title.value+'&goodsPoints='+needPoints.value
 	   })
 	}