merge

manifest.json

@@ -2,8 +2,8 @@
     "name" : "链商星球",
     "appid" : "__UNI__1F65101",
     "description" : "安徽星煌，链商星球商家工具",
-    "versionName" : "1.2.1",
+    "versionName" : "1.2.2",
-    "versionCode" : 121,
+    "versionCode" : 122,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/found/index.vue

@@ -66,8 +66,8 @@
 					<view class="task-title">{{item.title}}</view>
 					<view class="task-subtitle">{{item.sub_title}}</view>
 					<view class="task-label" :class="{'active' : item.is_finish}">
-                        <image v-if="!item.is_finish" class="task-label-img" src="/static/icons/crystal-icon.png" mode="widthFix" />
+                        {{ !item.is_finish ? '+' : ''}}<image v-if="!item.is_finish" class="task-label-img" src="/static/icons/crystal-icon.png" mode="widthFix" />
-                        {{item.is_finish ? '已完成' : item.tips}}
+                        {{ item.is_finish ? '已完成' : item.tips}}
                         <block v-if="!item.is_finish">/人</block>
 						<image @click.stop="showHelp(item.title, item.remark)" class="task-label-icon"
 							src="@/static/imgs/user-crystalMark-grey.png"></image>

pages/index/new_file.js

@@ -1,70 +0,0 @@
-<<<<<<< HEAD
-
-config.appendPadding = [10, 30, 10, 15]
-const chart = new F2.Chart(config);
-chart.source(data, {
-	date: {
-		range: [0, 1],
-		type: 'timeCat',
-		mask: 'MM-DD'
-	},
-	value: {
-		tickCount: 0
-	}
-});
-chart.legend({
-	position: 'bottom',
-	offsetY: 0,
-	offsetX: 30
-});
-chart.area()
-	.position('date*value')
-	.color('name', ['#5881d3', '#ca66e0'])
-	.shape('smooth')
-chart.line()
-	.position('date*value')
-	.color('name', ['#5881d3', '#ca66e0'])
-	.shape('smooth', name => {
-		if (name === '预期收益率') {
-			return 'line';
-		}
-		if (name === '实际收益率') {
-			return 'line';
-		}
-	});
-=======
-
-config.appendPadding = [10, 30, 10, 15]
-const chart = new F2.Chart(config);
-chart.source(data, {
-	date: {
-		range: [0, 1],
-		type: 'timeCat',
-		mask: 'MM-DD'
-	},
-	value: {
-		tickCount: 0
-	}
-});
-chart.legend({
-	position: 'bottom',
-	offsetY: 0,
-	offsetX: 30
-});
-chart.area()
-	.position('date*value')
-	.color('name', ['#5881d3', '#ca66e0'])
-	.shape('smooth')
-chart.line()
-	.position('date*value')
-	.color('name', ['#5881d3', '#ca66e0'])
-	.shape('smooth', name => {
-		if (name === '预期收益率') {
-			return 'line';
-		}
-		if (name === '实际收益率') {
-			return 'line';
-		}
-	});
->>>>>>> eba5f5995696e08f67df615fb32054bffa94ae34
-chart.render();

vue.config.js

@@ -16,5 +16,6 @@ module.exports = {
 				}, true)
 			})
 		]
-	}
+	},
+	lintOnSave:false // 关闭语法检查
 }