Merge branch 'dev' 4.8

pages_goods/exchange/address.vue

@@ -110,8 +110,8 @@ import unidialog from '@/components/dialog/dialog.vue';
 const freeVisible = ref(false)
 const freeContent = ref('')
 const goods_order_id = ref('')
-const goodsPoints=ref(0);
 const points = ref(0)
+const goodsPoints=ref(0);
 const freeClose = () => {
 	freeVisible.value = false
 }
@@ -126,6 +126,28 @@ const freeConfirm = () => {
 				icon: 'none',
 				duration: 1000
 			});
+			let belong = '';
+		if(goodsName.value.indexOf('U盘') > -1 || goodsName.value.indexOf('u盘') > -1){
+			belong = 'U盘';
+		}else if(goodsName.value.indexOf('京东E卡') > -1){
+			belong = '京东E卡';
+		}else{
+			belong = '书籍';
+		}
+			uni.sendNativeEvent("portraitReport",{
+      msg:{
+        event_nickname: "boint_jifengood",
+        page_type: "积分商城",
+		resource_name:goodsName.value,
+		event_val:goodsPoints.value,
+		event_unit:'积分',
+		number:goodsNum.value,
+		belong:belong,
+      },
+    },
+    (ret) => {
+      console.log(ret);
+    });
 			setTimeout(() => {
 				navTo({
 					url: '/pages_goods/pointMall/pointMall?from=exchange'
@@ -260,28 +282,6 @@ const submit = () => {
 		address: regionText.value+detail.value
 	}).then(res => {
        if(res.code == 1 || res.code == 200){
-		let belong = '';
-		if(type.value == 1){
-			belong = 'U盘';
-		}else if(goodsName.value.indexOf('京东E卡') > -1){
-			belong = '京东E卡';
-		}else{
-			belong = '书籍';
-		}
-	// 	uni.sendNativeEvent("portraitReport",{
-    //   msg:{
-    //     event_nickname: "boint_jifengood",
-    //     page_type: "积分商城",
-	// 	resource_name:goodsName.value,
-	// 	event_val:goodsPoints.value,
-	// 	event_unit:'积分',
-	// 	number:goodsNum.value,
-	// 	belong:belong,
-    //   },
-    // },
-    // (ret) => {
-    //   console.log(ret);
-    // });
 		points.value = res.data.pionts;
 		freeVisible.value = true
 		goods_order_id.value = res.data.goods_order_id