Merge remote-tracking branch 'origin/feature-1.1-dev' into feature-1.1-dev

# Conflicts:
#	pages/userInfo/vip/vip.vue

pages/ai/paint/loverPaint.vue

@@ -29,7 +29,7 @@
 		<view class="desc-box">
 			<text class="title">场景描述</text>
 			<textarea  class="desc-input" v-model="sceneDesc"
-			placeholder="描述一下你们的场景吧~" />
+			placeholder="描述一下你们的场景吧~(例:在教堂,在海边,在美术馆,咖啡馆...)" />
 			<!-- <view class="bottom-box">
 				<view class="keyTips" @click="clickRandomKey()"></view>
 				<view class="limit">{{drawDesc.length}}/50</view>
@@ -93,7 +93,7 @@
 			},
 			//随机选取提示词
 			getRandPrompt() {
-				this.promptList = this.getRandomArrayElements(this.promptList, 10)
+				this.promptList = this.getRandomArrayElements(this.promptList, 5)
 				this.promptText = this.promptList[this.prompt_active].text
 			},
 			//获取提示词列表

pages/userInfo/userInfo.vue

@@ -418,7 +418,7 @@ import UniIcons from "../../uni_modules/uni-icons/components/uni-icons/uni-icons
 
         }
 		.titleLogo{
-		  color: orange;
+		  color: #1a94bc;
 		}
       }
 		}

pages/userInfo/vip/MemberScroll.vue

@@ -4,7 +4,7 @@
 	 <view v-for="(item2, index2) in memberList" :key="index"></view>
       <text class="member-name">{{ encryptString(item.name) }}</text>
       <text class="member-time">{{ calculateTimeDifference(item.time) }}</text>
-      <text class="member-info">购买了{{ item.duration }}个月{{ item.vipName }}</text>
+      <text class="member-info">购买了{{ item.duration }}张{{ item.vipName }}</text>
     </view>
   </view>
 </template>
@@ -15,7 +15,6 @@ export default {
   data() {
     return {
       memberList: [],
-	  vipList:['月卡','季卡','年卡']
     }
   },
   created() {
@@ -29,6 +28,8 @@ export default {
         '郑十一', '王十二', '陈十三', '杨十四', '朱十五', '秦十六', '许十七', '何十八'
       ];
 	  
+	  const vipList = ['月卡','周卡'];
+	  
       const currentDateTime = new Date();
 
       const memberCount = Math.floor(Math.random() * 6) + 5; // 生成5-10个数据
@@ -36,16 +37,18 @@ export default {
       for (let i = 0; i < memberCount; i++) {
         const randomName = this.generateRandomName(names);
         const randomDateTime = this.generateRandomDateTime(currentDateTime);
+		const randomCard = this.generateRandomCard(vipList);
 
         const member = {
           name: randomName,
           time: randomDateTime,
           duration: Math.floor(Math.random() * 12) + 1,
-          vipName: "月卡"
+          vipName: randomCard,
         };
         this.memberList.push(member);
       }
     },
+	//随机生成姓名
     generateRandomName(names) {
       const randomIndex = Math.floor(Math.random() * names.length);
       const randomName = names[randomIndex];
@@ -53,6 +56,11 @@ export default {
       return randomName;
     },
 	
+	//随机生成vip卡名
+	generateRandomCard(vipList){
+		return vipList[Math.floor(Math.random() * vipList.length)];
+	},
+
     padZero(num) {
       return num.toString().padStart(2, '0');
     },

pages/userInfo/vip/vip.vue

@@ -36,8 +36,8 @@
       </view>
 	  
 	  <view class="" v-if="systemInfo === 'ios'">
-		<view class="iosStyle">由于相关政策,ios端暂不支持开通会员,请谅解.您可通过联系"次元意境"官方客服了解详情。</view>
-		<button class="linkToUs" type="default" plain="true" size="mini" open-type="im" data-im-id="DimenMusicHub">联系客服</button>
+		<view class="iosStyle">由于相关政策,ios端暂不支持开通会员,请谅解.</view>
+		<!-- <button class="linkToUs" type="default" plain="true" size="mini" open-type="im" data-im-id="DimenMusicHub">联系客服</button> -->
 	  </view>
 
       <button class="sumbit-btn" @click="$noMultipleClicks(openVip)" :disabled="disabled" v-if="systemInfo != 'ios'">
@@ -294,12 +294,12 @@
 		
 		.vip-box {
 			margin: 30px 0;
-			@include flex(center, space-between);
+			@include flex(center, space-around);
 			
 			
 
 			.vip-box__item {
-				width: 30%;
+				width: 45%;
 				height: 300rpx;
 				padding: 20rpx;
 				@include flex;
@@ -339,7 +339,7 @@
 					height: 50rpx;
 					background-color: #e8f4ff;
 					font-size: 24rpx;
-					color: #68c2ff;
+					color: #ff0000;
 					@include flex;
 				}
 			}