XSXS před 2 měsíci
rodič
revize
696becdcd4

+ 199 - 195
components/guide/GuideManager.vue

@@ -37,199 +37,7 @@ export default {
       // completedMainLines: [],
       // 引导配置
       guideConfig: {
-        mainLines: [
-          {
-            name: "new immigrant",
-            stage: "homeLand",
-            steps: [
-              {
-                arrow: null,
-                talkData: [
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '你好!欢迎来到萌创星球,你的移民计划正式完成。',
-                    position: 'left',
-                    isMirror: true
-                  }
-                ]
-              },
-              {
-                arrow: {x: 350, y: 460, r: 0},
-                talkData: [
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '这里是工具台 ,它可以制作各实用和非常棒的工具和装饰物,千万不要错过哟。',
-                    position: 'left',
-                    isMirror: true
-                  },
-                ]
-              }
-            ]
-          },
-          {
-            name: "new craftsman",
-            stage: "homeLand_table",
-            steps: [
-              {
-                arrow: null,
-                talkData: [
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '果然很顺利的打开了工作台呢!',
-                    position: 'left',
-                    isMirror: true
-                  },
-                  {
-                    characterImage: this.picture,
-                    characterName: this.name,
-                    text: '好像可以有好多工具,但是好像没有材料呢~',
-                    position: 'right',
-                    isMirror: false
-                  },
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '材料确实不太容易获取呢,可以去看看公告栏。',
-                    position: 'left',
-                    isMirror: true
-                  }
-
-                ]
-              },
-              {
-                arrow: {x: 885, y: 535, r: 270},
-                talkData: [
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '看到小箭头指示的地方了么...那是任务看板,可以获取一些稀有道具和铃钱哦。',
-                    position: 'left',
-                    isMirror: true
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            name: "oh, taskBoard",
-            stage: "homeLand_TaskBoard",
-            steps: [
-              {
-                arrow: null,
-                talkData: [
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '这里就是任务面板呦....',
-                    position: 'left',
-                    isMirror: true
-                  },
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '顺便说一下,你的移民计划正式开启目前您需要缴纳移民费用为388888元。也在任务面板发布了呦~',
-                    position: 'left',
-                    isMirror: true
-                  },
-                  {
-                    characterImage: this.picture,
-                    characterName: this.name,
-                    text: '什么!移民费用388888铃钱,这也太贵了吧...',
-                    position: 'right',
-                    isMirror: false
-                  },
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '移民本就是一件不容易的事呢...',
-                    position: 'left',
-                    isMirror: true
-                  },
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '对了,听说近期市政厅那边的花田正在招募园丁,报酬丰厚,',
-                    position: 'left',
-                    isMirror: true
-                  },
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '相信以你的能力完全是没问题的,右侧过桥后就到了。',
-                    position: 'left',
-                    isMirror: true
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            name: "welcome to mainLand~",
-            stage: "mainLand",
-            steps: [
-              {
-                arrow: null,
-                talkData: [
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '正式欢迎您来到我们的市政厅所在的主岛....',
-                    position: 'left',
-                    isMirror: true
-                  },
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '因为前几天发生了台风,所以还有两条路被倒下的树给拦住了。',
-                    position: 'left',
-                    isMirror: true
-                  },
-                  {
-                    characterImage: this.picture,
-                    characterName: this.name,
-                    text: 'ah...原来如此,你刚才说的花田有没有被拦住?',
-                    position: 'right',
-                    isMirror: false
-                  }
-                ]
-              },
-              {
-                arrow: {x: 785, y: 535, r: 270},
-                talkData: [
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '哦~瞧我这记性,花田在市政厅的旁边,就在那儿。走,我会告诉你怎么种花。',
-                    position: 'left',
-                    isMirror: true
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            name: "flowerFarm",
-            stage: "mainLand_farm",
-            steps: [
-              {
-                arrow: null,
-                talkData: [
-                  {
-                    characterImage: '/static/island/npc.png',
-                    characterName: '罗宾',
-                    text: '快来吧,这里就是花田了。',
-                    position: 'left',
-                    isMirror: true
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
+        },
       // 当前主线ID
       currentMainLineId: 0,
       // 当前主线
@@ -242,7 +50,7 @@ export default {
   },
   computed: {
     ...mapState('switchingModule', ['picture', 'name']),
-    // 当前步骤
+        // 当前步骤
     currentStep() {
       if (!this.currentStage) return null
       return this.currentStage.steps[this.currentStepIndex]
@@ -531,10 +339,206 @@ export default {
   mounted() {
     // 加载已完成主线和当前主线ID
     // this.loadCompletedMainLines();
+	var _this = this
+	_this.guideConfig = { mainLines: [
+          {
+            name: "new immigrant",
+            stage: "homeLand",
+            steps: [
+              {
+                arrow: null,
+                talkData: [
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '你好!欢迎来到萌创星球,你的移民计划正式完成。',
+                    position: 'left',
+                    isMirror: true
+                  }
+                ]
+              },
+              {
+                arrow: {x: 350, y: 460, r: 0},
+                talkData: [
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '这里是工具台 ,它可以制作各实用和非常棒的工具和装饰物,千万不要错过哟。',
+                    position: 'left',
+                    isMirror: true
+                  },
+                ]
+              }
+            ]
+          },
+          {
+            name: "new craftsman",
+            stage: "homeLand_table",
+            steps: [
+              {
+                arrow: null,
+                talkData: [
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '果然很顺利的打开了工作台呢!',
+                    position: 'left',
+                    isMirror: true
+                  },
+                  {
+                    characterImage: _this.picture,
+                    characterName: _this.name,
+                    text: '好像可以有好多工具,但是好像没有材料呢~',
+                    position: 'right',
+                    isMirror: false
+                  },
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '材料确实不太容易获取呢,可以去看看公告栏。',
+                    position: 'left',
+                    isMirror: true
+                  }
+
+                ]
+              },
+              {
+                arrow: {x: 885, y: 535, r: 270},
+                talkData: [
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '看到小箭头指示的地方了么...那是任务看板,可以获取一些稀有道具和铃钱哦。',
+                    position: 'left',
+                    isMirror: true
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            name: "oh, taskBoard",
+            stage: "homeLand_TaskBoard",
+            steps: [
+              {
+                arrow: null,
+                talkData: [
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '这里就是任务面板呦....',
+                    position: 'left',
+                    isMirror: true
+                  },
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '顺便说一下,你的移民计划正式开启目前您需要缴纳移民费用为388888元。也在任务面板发布了呦~',
+                    position: 'left',
+                    isMirror: true
+                  },
+                  {
+                    characterImage: '/static/island/building/1.png',
+                    characterName: '我',
+                    text: '什么!移民费用388888铃钱,这也太贵了吧...',
+                    position: 'right',
+                    isMirror: false
+                  },
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '移民本就是一件不容易的事呢...',
+                    position: 'left',
+                    isMirror: true
+                  },
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '对了,听说近期市政厅那边的花田正在招募园丁,报酬丰厚,',
+                    position: 'left',
+                    isMirror: true
+                  },
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '相信以你的能力完全是没问题的,右侧过桥后就到了。',
+                    position: 'left',
+                    isMirror: true
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            name: "welcome to mainLand~",
+            stage: "mainLand",
+            steps: [
+              {
+                arrow: null,
+                talkData: [
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '正式欢迎您来到我们的市政厅所在的主岛....',
+                    position: 'left',
+                    isMirror: true
+                  },
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '因为前几天发生了台风,所以还有两条路被倒下的树给拦住了。',
+                    position: 'left',
+                    isMirror: true
+                  },
+                  {
+                    characterImage: '/static/island/building/1.png',
+                    characterName: '我',
+                    text: 'ah...原来如此,你刚才说的花田有没有被拦住?',
+                    position: 'right',
+                    isMirror: false
+                  }
+                ]
+              },
+              {
+                arrow: {x: 785, y: 535, r: 270},
+                talkData: [
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '哦~瞧我这记性,花田在市政厅的旁边,就在那儿。走,我会告诉你怎么种花。',
+                    position: 'left',
+                    isMirror: true
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            name: "flowerFarm",
+            stage: "mainLand_farm",
+            steps: [
+              {
+                arrow: null,
+                talkData: [
+                  {
+                    characterImage: '/static/island/npc.png',
+                    characterName: '罗宾',
+                    text: '快来吧,这里就是花田了。',
+                    position: 'left',
+                    isMirror: true
+                  }
+                ]
+              }
+            ]
+          }
+        ]}
+     
     this.loadCurrentMainLineId();
     //测试重置主线
     // this.currentMainLineId=0;
-  }
+    console.log(this.guideConfig,'------------------------');
+    
+ }
 }
 </script>
 

+ 1 - 4
node_modules/.vue-global-types/vue_99_0_0_0.d.ts

@@ -72,9 +72,6 @@ export {};
 		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
 		, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
 	>>;
-	type __VLS_OmitStringIndex<T> = {
-		[K in keyof T as string extends K ? never : K]: T[K];
-	};
 	type __VLS_UseTemplateRef<T> = Readonly<import('vue').ShallowRef<T | null>>;
 
 	function __VLS_getVForSourceType<T extends number | string | any[] | Iterable<any>>(source: T): [
@@ -116,6 +113,6 @@ export {};
 		: (_: {} & Record<string, unknown>, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {} & Record<string, unknown> } };
 	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
 	function __VLS_asFunctionalElement<T>(tag: T, endTag?: T): (attrs: T & Record<string, unknown>) => void;
-	function __VLS_asFunctionalSlot<S>(slot: S): (props: NonNullable<S> extends (props: infer P) => any ? P : {}) => void;
+	function __VLS_asFunctionalSlot<S>(slot: S): S extends () => infer R ? (props: {}) => R : NonNullable<S>;
 	function __VLS_tryAsConstant<const T>(t: T): T;
 }

+ 1 - 3
pages/index/index.vue

@@ -286,9 +286,7 @@ export default {
 			},
 			windowHeight: uni.getWindowInfo().windowHeight,
 			bannerList: [
-				"../../static/dome/home-swper.png",
-				"../../static/dome/home-swper.png",
-				"../../static/dome/home-swper.png",
+				"../../static/dome/home-swper.png", 
 			],
 			cardList: [ ],
 			list: [], // 瀑布流全部数据

+ 2 - 2
pages/isLand/HuaTian.vue

@@ -129,7 +129,7 @@ select_zz:7种花的view,默认应该隐藏,点击播种时显示,播种
 						<view class="tips-items">
 							<view class="tips-item">
 								<image src="../../static/island/huatian/tips1.png" class="tips-img"></image>
-								<view class="tips-text">点击【解锁荒地】,中高亮闪烁的荒地,消耗铃钱解锁新的种植地块。</view>
+								<view class="tips-text">点击【解锁荒地】,消耗铃钱解锁新的种植地块。</view>
 							</view>
 							<view class="tips-item">
 								<image src="../../static/island/huatian/tips2.png" class="tips-img"></image>
@@ -141,7 +141,7 @@ select_zz:7种花的view,默认应该隐藏,点击播种时显示,播种
 						<view class="tips-items">
 							<view class="tips-item">
 								<image src="../../static/island/huatian/tips3.png" class="tips-img"></image>
-								<view class="tips-text">点击【播种】,选心仪的花种播撒至高亮区域,查看成熟期或消耗 M 币加速生长。</view>
+								<view class="tips-text">点击【播种】,选心仪的花种播撒至高亮区域。</view>
 							</view>
 							<view class="tips-item">
 								<image src="../../static/island/huatian/tips4.png" class="tips-img"></image>

+ 1 - 1
pages/login/login.vue

@@ -102,7 +102,7 @@ export default {
 			},
 			mobile: '',
 			password: '',
-			code: '123601',
+			code: '',
 			captchaTime: 0,
 			push_token: '',
 			lat: '',

+ 8 - 5
pages/make/index.vue

@@ -61,7 +61,7 @@
 		<view class="guide-title"> 引导教程</view>
 		<!-- 引导教程区域 -->
 		<view class="tutorial">
-			<view class="tutorial-block " @click="handleTutorialClick(index)" v-for="(item, index) in tutorial"
+			<view class="tutorial-block " @click="goWeb(item.url,item.subheading )" v-for="(item, index) in tutorial"
 				:key="index">
 				<text class="tutorial-btn-box">
 					<view class="tutorial-btn">
@@ -119,9 +119,9 @@ export default {
 				}]
 			},
 			tutorial:[
-				{title:"官方教程",url:"/pages/make/officialTutorial",subheading:"星球造物,AI创角",content:"使用自然语言,创建独属于你的智能体"},
-				{title:"官方教程",url:"/pages/make/officialTutorial",subheading:"AI灵感写歌",content:"使用AI超能力释放你的无限创造力!"},
-				{title:"官方教程",url:"/pages/make/officialTutorial",subheading:"萌萌智绘魔方",content:"教你如何创作内容,激发创作灵感!" },
+				{title:"官方教程",url:"https://docs.qingque.cn/d/home/eZQC3yyQj9gK-KnVUZOT6vYmn?identityId=2HSXOrUAEOx",subheading:"星球造物,AI创角",content:"使用自然语言,创建独属于你的智能体"},
+				{title:"官方教程",url:"https://docs.qingque.cn/d/home/eZQDGgIXzR08ssYlwoy2tjiNA?identityId=2HSXOrUAEOx",subheading:"AI灵感写歌",content:"使用AI超能力释放你的无限创造力!"},
+				{title:"官方教程",url:"https://docs.qingque.cn/d/home/eZQBj5luSHVkaqpJmL5PTuFfZ?identityId=2HSXOrUAEOx",subheading:"萌萌智绘魔方",content:"教你如何创作内容,激发创作灵感!" },
 			]
 		}
 	}, 
@@ -137,7 +137,10 @@ export default {
 
 	// 下拉刷新数据
 	methods: {
-		
+		goWeb(url, title) {
+			uni.navigateTo({
+				url: `/pages/webview/index?url=${encodeURIComponent(url)}&title=${encodeURIComponent(title)	}`
+			})},
 		getMyInfo() {
 			uni.request({
 				url: this.$apiHost + '/My/getnum',

+ 1 - 1
pages/my/job.vue

@@ -228,7 +228,7 @@ export default {
 			},
 			{
 				dayNum: "05",
-				reward: "30星源",
+				reward: "30星源", 
 				isVip: false,
 			},
 			{

+ 3 - 1
pages/my/setting.vue

@@ -136,7 +136,8 @@ export default {
     }
   },
   methods: {
-    ...mapMutations('rightsManagement',[ 'setIsContentRecommendation']),
+    ...mapMutations('rightsManagement',[ 'setIsContentRecommendation']), 
+    ...mapMutations('switchingModule', ['deleteInformation']),
     openCustomPopup() {
       this.$refs.customerServicePopup.open();
     },
@@ -385,6 +386,7 @@ export default {
           uni.removeStorageSync("user_id");
           uni.removeStorageSync("is_login");
           removeStorage("isContentRecommendation");
+          this.deleteInformation();
           uni.redirectTo({
             url: "/pages/login/login",
           });