From 032d3160e131224d48b7b0a593d91407552c3a4a Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Tue, 26 Mar 2024 16:38:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mixins/config.js                  |  2 +-
 pages/activity/event.vue          | 20 ++++++++++++++++++--
 pages/special/member_recharge.vue |  2 +-
 pages/store/goodsCate.vue         |  2 +-
 pages/topic/question_sheet.vue    |  1 -
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/mixins/config.js b/mixins/config.js
index df9d005..9b706b0 100644
--- a/mixins/config.js
+++ b/mixins/config.js
@@ -5,7 +5,7 @@ const { IMAGE_ASSETS_URL } = config;
 export default {
     methods: {
         getImgPath(path) {
-            return IMAGE_ASSETS_URL + path;
+            return path.indexOf('http') > -1 ? path : IMAGE_ASSETS_URL + path;
         }
     }
 }
\ No newline at end of file
diff --git a/pages/activity/event.vue b/pages/activity/event.vue
index 29e55db..8fbc7d8 100644
--- a/pages/activity/event.vue
+++ b/pages/activity/event.vue
@@ -4,7 +4,7 @@
         <view class="form-section">
             <form>
                 <label :class="{ required: item.is_required }" v-for="(item, index) in event" :key="item.id">
-                    <view>{{ item.event_name }}</view>
+                    <view>{{ item.event_name }}：</view>
                     <input v-if="item.event_type === 1" v-model.trim="item.event_value"
                         :placeholder="'请输入' + item.event_name" type="text">
                     <input v-else-if="item.event_type === 4" v-model.trim="item.event_value"
@@ -346,13 +346,29 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-	.active-event {
+	.activity-event {
 		backrgound: #f5f5f5;
 		.form-section {
 			width: 690rpx;
 			background: #fff;
 			border-radius: 10rpx;
 			margin: 20rpx auto;
+			padding: 30rpx 40rpx;
+			uni-label {
+				padding: 0;
+				margin-bottom: 26rpx;
+				&:last-child {
+					margin-bottom: 0;
+				}
+			}
+			input {
+				// background: #f7f7f7;
+				height: 100%;
+				flex: 0 0 400rpx;
+				margin-left: auto;
+				border-radius: 10rpx;
+				padding: 0 20rpx;
+			}
 		}
 	}
 .activity-event .form-section uni-label uni-label {
diff --git a/pages/special/member_recharge.vue b/pages/special/member_recharge.vue
index 3e3e394..ab859c2 100644
--- a/pages/special/member_recharge.vue
+++ b/pages/special/member_recharge.vue
@@ -3,7 +3,7 @@
     <NavBar title="会员管理" backGround="#100C09" titleFontColor='#FFFFFF' backIcon='/static/icon/arrow-left-white.png' />
     <view class="member-recharge">
       <view v-if="userInfo" class=" boxs user-section flex flex-center-x">
-        <image :src="userInfo.avatar" />
+        <image :src="getImgPath(userInfo.avatar)" />
         <view class="text">
           <view class="name">{{ userInfo.nickname }}</view>
           <view v-if="userInfo.level && userInfo.is_permanent" class="info">永久会员</view>
diff --git a/pages/store/goodsCate.vue b/pages/store/goodsCate.vue
index 55b62af..0881e09 100644
--- a/pages/store/goodsCate.vue
+++ b/pages/store/goodsCate.vue
@@ -94,7 +94,7 @@
 					case 'learning':
 						let pages = getCurrentPages();
 						let prevPage = pages[pages.length - 2];
-						prevPage.$vm.learningData.exam.examName = con.name;
+						prevPage.$vm.learningData.exam.name = con.name;
 						prevPage.$vm.learningData.exam.grade_id = con.grade_id;
 						prevPage.$vm.learningData.exam.subject_id = con.id;
 						uni.navigateBack();
diff --git a/pages/topic/question_sheet.vue b/pages/topic/question_sheet.vue
index 2b3e36b..5729a4b 100644
--- a/pages/topic/question_sheet.vue
+++ b/pages/topic/question_sheet.vue
@@ -82,7 +82,6 @@ export default {
     this.test_id = test_id;
     this.record_id = record_id;
     this.is_analysis = parseInt(is_analysis);
-		console.log(this.is_analysis, 85);
     if (index) {
       this.index = parseInt(index);
     }