diff --git a/components/cmd-progress/cmd-progress.vue b/components/cmd-progress/cmd-progress.vue
new file mode 100644
index 0000000..ca0c3ae
--- /dev/null
+++ b/components/cmd-progress/cmd-progress.vue
@@ -0,0 +1,607 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{setFormat}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{setFormat}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/yomol-prompt/README.md b/components/yomol-prompt/README.md
new file mode 100644
index 0000000..2e5e3d8
--- /dev/null
+++ b/components/yomol-prompt/README.md
@@ -0,0 +1,88 @@
+ ## 说明
+
+输入内容并返回内容的prompt组件
+
+提示名称: title
+
+输入类型:inputType
+
+默认值:defaultValue
+
+input逻辑处理方法名称: func
+
+输入最大长度:maxlength
+
+主色:themeColor
+
+
+## 用法
+
+**父组件**
+
+```html
+
+
+
+
+
+```
+
+```js
+
+```
\ No newline at end of file
diff --git a/components/yomol-prompt/yomol-prompt.vue b/components/yomol-prompt/yomol-prompt.vue
new file mode 100644
index 0000000..d320133
--- /dev/null
+++ b/components/yomol-prompt/yomol-prompt.vue
@@ -0,0 +1,211 @@
+
+
+
+ {{title}}
+
+
+
+
+
+ {{cancelText}}
+ {{sureText}}
+
+
+
+
+
+
+
+
diff --git a/components/yomol-upgrade/README.md b/components/yomol-upgrade/README.md
new file mode 100644
index 0000000..8d84148
--- /dev/null
+++ b/components/yomol-upgrade/README.md
@@ -0,0 +1,81 @@
+ ## 说明
+
+检测版本更新,并自动下载安装的组件
+
+后台逻辑用户自定义,我的是java
+
+联系QQ: 1397551270
+
+
+## 用法
+
+**父组件**
+
+```html
+
+
+
+
+
+```
+
+```js
+
+```
\ No newline at end of file
diff --git a/components/yomol-upgrade/yomol-upgrade.vue b/components/yomol-upgrade/yomol-upgrade.vue
new file mode 100644
index 0000000..91ac9d4
--- /dev/null
+++ b/components/yomol-upgrade/yomol-upgrade.vue
@@ -0,0 +1,196 @@
+
+
+
+ {{title}}
+ 新版更新内容
+
+
+ {{item}}
+
+
+
+
+ 马上升级
+
+
+
+
+
+
+
+
+
diff --git a/manifest.json b/manifest.json
index acdd642..3c8ed0a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
"appid" : "__UNI__AB411CB",
"description" : "",
"versionName" : "1.0.0",
- "versionCode" : "100",
+ "versionCode" : 2,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f8bd7f6..da83cf6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -25,6 +25,7 @@
+
@@ -34,16 +35,22 @@
import uniListItem from "@/components/uni-list-item/uni-list-item.vue"
import uniLoadMore from "@/components/uni-load-more/uni-load-more.vue"
import common from '../../common/common.js'
+ import yomolUpgrade from '@/components/yomol-upgrade/yomol-upgrade.vue'
var _self;
export default {
components: {
uniList,
uniListItem,
- uniLoadMore
+ uniLoadMore,
+ yomolUpgrade
},
data() {
return {
token: '',
+ /* 版本更新 */
+ upgradeType: 'pkg', //pkg 整包 wgt 升级包
+ upgradeContent: '', //更新内容
+ upgradeUrl: '', //更新地址
divider: ' | ',
evaluations: [],
more: 'more',
@@ -65,6 +72,7 @@
_self.token = appToken;
uni.startPullDownRefresh({});
_self.initData();
+ _self.checkAppVersion();
},
onPullDownRefresh() {
var self = this;
@@ -72,6 +80,32 @@
self.initData();
},
methods: {
+ checkAppVersion() {
+ var versionUrl = common.userCenterBaseUrl +
+ '/app/appversion/getappversionnumber/240fbf7a-aa32-4cde-9674-5147a7d5eb2f'
+ var downloadUrl = common.userCenterBaseUrl + '/app/appversion/downloadapp/240fbf7a-aa32-4cde-9674-5147a7d5eb2f'
+ uni.request({
+ url: versionUrl,
+ header: {
+ 'token': _self.token
+ },
+ success(res) {
+ plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+ var appId = wgtinfo.appid;
+ var appVersion = wgtinfo.versionCode;
+ if (res.data.data && res.data.data > appVersion) {
+ _self.upgradeType = 'pkg'
+ _self.upgradeContent = "新增部分更能,请更新;"
+ _self.upgradeUrl = downloadUrl
+ _self.$refs.yomolUpgrade.show()
+ } else {
+ }
+ });
+ },
+ fail(error) {
+ }
+ })
+ },
initData() {
var self = this;
var listUrl = common.evalutaionBaseUrl + '/app/apptask/listtasktoapp';
@@ -104,7 +138,6 @@
})
},
itemClick(e) {
- console.log(e);
uni.navigateTo({
url: '../evaluation/doEvaluation?taskId=' + e.taskId
})
diff --git a/pages/login/index.vue b/pages/login/index.vue
index e592b1f..6f04f2f 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -3,7 +3,7 @@
-
+
您好!
欢迎来到民主测评平台
@@ -144,12 +144,14 @@