Merge branch 'master' of http://gitlab.91isoft.com:90/gaoyu/emall_miniapp

my/myIntegral/detail/index.vue

@@ -4,24 +4,46 @@
 			<view class="testTitle">积分变更</view>
 			<view class="line"></view>
 			<view class="testInfo">变更详情</view>
-			<view style="display: inline-block;float: right; color: red; margin: 8px 8px 8px 10px;">+200</view>
+			<view style="display: inline-block;float: right; color: red; margin: 8px 8px 8px 10px;">
+			    <span v-if="integraldetail.type === 0">+{{integraldetail.integral}} </span>
+				<span v-if="integraldetail.type === 1">-{{integraldetail.integral}} </span>
+			</view>
 			<view class="line"></view>
 			<view class="testInfo">变更时间</view>
-			<view class="testInfoOtherRight">2023-07-13 09:30:18</view>
+			<view class="testInfoOtherRight">{{integraldetail.modifyTime}}</view>
 			<view class="line"></view>
 			<view class="testInfo">积分类型</view>
-			<view class="testInfoOtherRight">新会员福利</view>
+			<view class="testInfoOtherRight">{{integraldetail.styleName}}</view>
 		</view>
 		<view class="particulars">
 			<view class="testTitle">详情信息</view>
 			<view class="line"></view>
-			<view class="testInfoOtherLeft">商场名称：天津复悦里</view>
+			<view class="testInfoOtherLeft">商场名称：{{name}}</view>
 			<view class="line"></view>
-			<view class="testInfoOtherLeft">通过注册送积分获得200积分</view>
+			<view class="testInfoOtherLeft">{{integraldetail.remarks}}</view>
 		</view>
 	</view>
 </template>
 <script>
+export default {
+  data() {
+    return {
+		integraldetail:'',
+		name:''
+
+    };
+  },
+  onLoad(options){
+	  console.log('options',options)
+	  this.integraldetail=JSON.parse(decodeURIComponent(options.id))
+	  console.log('data',this.integraldetail)
+	  console.log('商圈', options.name);
+	  this.name = options.name
+  },
+  methods:{
+	  
+  },
+}
 	
 </script>
 <style lang="scss" scoped>

my/myIntegral/index.vue

@@ -21,7 +21,7 @@
 			<view class="title">积分明细</view>
 			<!-- 列表 -->
 			<view class="list">
-				<view class="list-item" @click="toDetail" v-for="item in integralList">
+				<view class="list-item" @click="toDetail(item)" v-for="item in integralList">
 					<view class="left">
 						<view class="title1">{{item.remarks}}</view>
 						<view class="title2">{{businessMessage.name}} {{item.styleName}}</view>
@@ -50,7 +50,9 @@
 					page: 1,
 					limit: 20
 				},
-				integralList: []
+				integralList: [],
+				// 商圈名称
+				name:''
 			}
 		},
 		onShow() {
@@ -66,6 +68,7 @@
 						// that.ishaveBusiness = true
 						that.businessMessage = res.data
 						console.log("商圈数据", that.businessMessage)
+						that.name = that.businessMessage.name
 					}
 				})
 				this.$nextTick(() => {
@@ -97,9 +100,10 @@
 					}
 				})
 			},
-			toDetail() {
+			toDetail(val) {
+				const data = JSON.stringify(val)
 				uni.navigateTo({
-					url: '/my/myIntegral/detail/index'
+					url: '/my/myIntegral/detail/index' +'?id=' + encodeURIComponent(data) + '&name=' + this.name
 				})
 			},
 			toRecord() {

pages/activity/activitydetail.vue

@@ -90,6 +90,7 @@ export default {
 	  this.type = options.type
 	  console.log("this.type",this.type)
 	  console.log('data',this.activitydetail)
+	  // 判断从哪个页面跳转详情页
 	  if(options.type === '0') {
 		  this.activityId = this.activitydetail.id
 	  } else {