fix

src/component/Administrator/allUser.vue

@@ -352,7 +352,7 @@ export default defineComponent({
             ];
         });
         //改变页码
-        let changePage = (e: any, filters, sorter) => {
+        let changePage = (e: any, filters:any, sorter:any) => {
             filterData.currentPage = e.current;
             filterData.pageSize = e.pageSize;
 			if(sorter.order){

src/component/Administrator/recentActiveChart.vue

@@ -193,8 +193,7 @@ export default defineComponent({
 			}else if(str == 'week'){
 				thirtyDaysAgoTimestamp = currentTimestamp - (7 * 24 * 60 * 60);
 			}
-			filterData.rangePickerValue[0] = formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD')
+			filterData.rangePickerValue = [formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD'),formatTime(currentTimestamp,'YYYY-MM-DD')]
-			filterData.rangePickerValue[1] = formatTime(currentTimestamp,'YYYY-MM-DD')
 			gettrialList();
 		}
 		let pageChartDom:any = ref()

src/component/Administrator/recentActiveUser.vue

@@ -41,6 +41,7 @@
 				:columns="columns"
 				:data-source="dataList"
 				:scroll="{ y: historyTableHeight }"
+				:showSorterTooltip='false'
 				@change="changePage"
 				:pagination="{
 					showSizeChanger: true,
@@ -265,8 +266,7 @@ export default defineComponent({
 			}else if(str == 'week'){
 				thirtyDaysAgoTimestamp = currentTimestamp - (7 * 24 * 60 * 60);
 			}
-			filterData.rangePickerValue[0] = formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD')
+			filterData.rangePickerValue = [formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD'),formatTime(currentTimestamp,'YYYY-MM-DD')]
-			filterData.rangePickerValue[1] = formatTime(currentTimestamp,'YYYY-MM-DD')
 			gettrialList();
 		}
 		onMounted(()=>{

src/component/Administrator/recentActiveUserChart.vue

@@ -119,13 +119,13 @@ export default defineComponent({
 					trigger: 'item'
 				},
 				legend: {
-					top: '5%',
+					top: '10%',
 					left: 'center'
 				},
 				series: [
 					{
 						type: 'pie',
-						radius: ['40%', '70%'],
+						radius: ['30%', '70%'],
 						avoidLabelOverlap: false,
 						
 						itemStyle: {
@@ -167,8 +167,7 @@ export default defineComponent({
 			}else if(str == 'week'){
 				thirtyDaysAgoTimestamp = currentTimestamp - (7 * 24 * 60 * 60);
 			}
-			filterData.rangePickerValue[0] = formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD')
+			filterData.rangePickerValue = [formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD'),formatTime(currentTimestamp,'YYYY-MM-DD')]
-			filterData.rangePickerValue[1] = formatTime(currentTimestamp,'YYYY-MM-DD')
 			gettrialList();
 		}
 		let pageChartDom:any = ref()

src/component/Administrator/recentNewUser.vue

@@ -282,8 +282,7 @@ export default defineComponent({
 			}else if(str == 'week'){
 				thirtyDaysAgoTimestamp = currentTimestamp - (7 * 24 * 60 * 60);
 			}
-			filterData.rangePickerValue[0] = formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD')
+			filterData.rangePickerValue = [formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD'),formatTime(currentTimestamp,'YYYY-MM-DD')]
-			filterData.rangePickerValue[1] = formatTime(currentTimestamp,'YYYY-MM-DD')
 			gettrialList();
 		}
 		onMounted(()=>{

src/component/Administrator/recentNewUserChart.vue

@@ -194,8 +194,7 @@ export default defineComponent({
 			}else if(str == 'week'){
 				thirtyDaysAgoTimestamp = currentTimestamp - (7 * 24 * 60 * 60);
 			}
-			filterData.rangePickerValue[0] = formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD')
+			filterData.rangePickerValue = [formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD'),formatTime(currentTimestamp,'YYYY-MM-DD')]
-			filterData.rangePickerValue[1] = formatTime(currentTimestamp,'YYYY-MM-DD')
 			gettrialList();
 		}
 		let pageChartDom:any = ref()

src/component/Administrator/trialAllUser.vue

@@ -4,12 +4,11 @@
 			<div class="admin_state">
 			
 				<div class="admin_state_item">
-					<span>State Time:</span>
+					<span>Select Time:</span>
 					<a-range-picker
-						style="width:280px"
+						style="width:250px"
 						class="range_picker"
 						v-model:value="rangePickerValue"
-						:allowClear="false"
 						:placeholder="[
 							$t('HistoryPage.StartDate'),
 							$t('HistoryPage.EndDate'),
@@ -22,6 +21,42 @@
 							></span>
 						</template>
 					</a-range-picker>
+				</div>
+				<div class="admin_state_item">
+                    <span>Country:</span>
+					<a-select
+                        v-model:value="country"
+						:allowClear="true"
+						show-search
+                        style="width: 250px"
+                        :filter-option="filterOption"
+                        placeholder="Select Item..."
+                        max-tag-count="responsive"
+                        :options="allCountry"
+                    ></a-select>
+                </div>
+                <div class="admin_state_item">
+                    <span>Email:</span>
+                    <input
+                        v-model="email"
+                        placeholder="Please enter email"
+                        @keydown.enter="gettrialList"
+                        type="text"
+                        style="width: 250px"
+                    />
+                </div>
+                <div class="admin_state_item">
+                    <span>User Name:</span>
+                    <a-select
+                        v-model:value="ids"
+                        mode="multiple"
+                        style="width: 250px"
+                        :filter-option="filterOption"
+                        placeholder="Select Item..."
+                        max-tag-count="responsive"
+                        :options="allUserList"
+                        @keydown.enter="gettrialList"
+                    ></a-select>
                 </div>
 			</div>
 			<div class="admin_search">
@@ -67,14 +102,22 @@ export default defineComponent({
         let filter:any =  reactive({
 			dataList:[],
 			tableLoading:false,
+			allUserList: [],
+			allCountry:[]
 		})
 		let filterData:any = reactive({
 			rangePickerValue:[],
 			currentPage: 1,
             pageSize: 10,
             total: 0,
+			country: "",
+            email: "",
+            userType: "",
+            ids: [],
+            occupation: "",
             order: "", //'Ascending  升序 Descending 降序'
 			orderBy:'',
+            userName: "",
 		})
 	
         let renameData: any = ref({}); //修改名字选中的数据
@@ -144,7 +187,7 @@ export default defineComponent({
             ];
         });
 		//改变页码
-		let changePage = (e: any, filters, sorter) => {
+		let changePage = (e: any, filters:any, sorter:any) => {
             filterData.currentPage = e.current;
             filterData.pageSize = e.pageSize;
 			if(sorter.order){
@@ -178,8 +221,14 @@ export default defineComponent({
 				startTime:startDate,
 				size: filterData.pageSize,
                 page: filterData.currentPage,
+                country: filterData.country,
+                email: filterData.email,
+                userType: filterData.userType,
+                ids: filterData.ids,
+                occupation: filterData.occupation,
                 order: filterData.order,
                 orderBy: filterData.orderBy,
+                userName: filterData.userName,
 			}
 			Https.axiosPost(Https.httpUrls.inquiryGetTrial,data).then((rv: any) => {
 				if (rv) {
@@ -192,6 +241,10 @@ export default defineComponent({
 				}
 			})
         }
+		let filterOption = (input: any, option: any) => {
+            // 使用 option.label 进行搜索
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+        };
 		let lastGeTrialList = (str:string)=>{
 			let currentDate = new Date();
 			let currentTimestamp = Math.floor(currentDate.getTime()  / 1000);
@@ -204,11 +257,18 @@ export default defineComponent({
 			}else if(str == 'week'){
 				thirtyDaysAgoTimestamp = currentTimestamp - (7 * 24 * 60 * 60);
 			}
-			filterData.rangePickerValue[0] = formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD')
+			filterData.rangePickerValue = [formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD'),formatTime(currentTimestamp,'YYYY-MM-DD')]
-			filterData.rangePickerValue[1] = formatTime(currentTimestamp,'YYYY-MM-DD')
 			gettrialList();
 		}
 		onMounted(()=>{
+			let allUserList: any = sessionStorage.getItem("allUserList");
+            if (allUserList) {
+                filter.allUserList = JSON.parse(allUserList);
+            }
+			let allCountry: any = sessionStorage.getItem("allCountry");
+            if (allCountry) {
+                filter.allCountry = JSON.parse(allCountry);
+            }
 			lastGeTrialList('month')
 		})
         return {
@@ -217,6 +277,7 @@ export default defineComponent({
             columns,
             renameData,
 			changePage,
+			filterOption,
 			searchHistoryList,
 			lastGeTrialList,
 			gettrialList,
@@ -240,3 +301,10 @@ export default defineComponent({
     },
 });
 </script>
+
+<style lang="less" scoped>
+.admin_page .admin_table_search .admin_state {
+    display: flex;
+    flex-wrap: wrap;
+}
+</style>

src/component/Administrator/trialUserConversionRateChart.vue

@@ -50,9 +50,18 @@ export default defineComponent({
 					let entries:any = Object.entries(rv);
                     let data: any = [];
 					for (let [key, value] of entries) {
+						let str 
+						console.log(key);
+						
+						
 						if(key != 'conversionRate'){
+							if(key == 'trialToOfficialCount'){
+								str = 'Trial To Official'
+							}else{
+								str = 'Trial User'
+							}
 							let obj = {
-								name: key,
+								name: str,
 								value: value
 							}
 							data.push(obj);
@@ -92,7 +101,7 @@ export default defineComponent({
 						formatter: '{a} <br/>{b} : {c} ({d}%)'
                     },
 					legend: {
-						top: '5%',
+						top: '10%',
 						left: 'center'
 					},
                     series: [

src/component/Administrator/trialUserCountry.vue

@@ -113,7 +113,7 @@ export default defineComponent({
                         {
                             type: "pie",
                             radius: "55%",
-                            center: ["40%", "50%"],
+                            center: ["50%", "55%"],
                             data: data,
                             emphasis: {
                                 itemStyle: {

src/component/Detail/habit.vue

@@ -813,6 +813,7 @@ export default defineComponent({
 		// 	this.store.commit("setTemplateData", event);
 		// },
 		async setWorkspaceStyle(data: any){
+			
 			// this.workspaceItem.styleId = data.id
 			this.workspaceItem.styleName = data.name
 			this.workspaceItem.style = data.value
@@ -820,6 +821,9 @@ export default defineComponent({
 			if(data.isRevampModel){
 				await this.getMannequins(true)
 			}
+			if(!this.workspaceItem.overallSingle){
+				this.workspaceItem.position = 'Overall'
+			}
 			this.putWorkspace(this.workspaceItem,this.workspaceItem.id)
 		},
 		setStyle(){

src/component/HomePage/ColorboardUpload.vue

@@ -281,6 +281,7 @@ export default defineComponent({
 			// return this.setGradientAngle(gradient)
 			return (gradient)=>{
 				let gradientStr = ''
+				if(!gradient.gradientList)return
 				gradient.gradientList.sort((a, b) => {
 					let aArr = a.left.split('%')[0]
 					let bArr = b.left.split('%')[0]
@@ -771,7 +772,7 @@ export default defineComponent({
 				this.colorList[this.selectIndex].gradient = JSON.parse(JSON.stringify(this.gradient))
 			}else{
 				this.selectColor = {rgba:this.colorList[this.selectIndex].gradient.gradientList[0].rgba}
-				this.colorList[this.selectIndex].gradient = {}
+				this.colorList[this.selectIndex].gradient = null
 			}
 			let colorList =this.colorList.filter((v) => v && Object.keys(v).length)
 			this.setColorboardList(colorList)

src/views/HomeMain.vue

@@ -400,9 +400,9 @@ export default defineComponent({
 		},
 		//教程
 		getTutorial(){
-			let url = 'https://code-create.com.hk/wp-content/uploads/2024/07/aida_3.0-使用手册-0705.pdf'
+			let url = 'https://code-create.com.hk/wp-content/uploads/2024/08/aida_3.0-Manual-0705-CN.pdf'
 			if(this.locale == 'ENGLISH'){
-				url = 'https://code-create.com.hk/wp-content/uploads/2024/07/aida_3.0-Manual-0705-1.pdf'
+				url = 'https://code-create.com.hk/wp-content/uploads/2024/08/aida_3.0-Manual-0705-EN.pdf'
 				showViewVideo({url:'https://code-create.com.hk/wp-content/uploads/2024/07/AiDA-demo-video_0709_EN.webm'})
 			}else{
 				showViewVideo({url:'https://code-create.com.hk/wp-content/uploads/2024/07/AiDA-demo-video_0709_CN.webm'})

src/views/feedbackSurvey.vue

@@ -725,6 +725,7 @@ export default defineComponent({
 			forbid.value =  true
 			for (const iterator in data) {
 				if(typeof data[iterator] == 'object'){
+					feedbackData[iterator] = []
 					data[iterator].forEach((item:any)=>{
 						if(item*1){
 							feedbackData[iterator].push(item)