diff --git a/App.vue b/App.vue
index cb974bf..f15c049 100644
--- a/App.vue
+++ b/App.vue
@@ -17,6 +17,7 @@ export default {
// console.log('onLaunch options: ', options);
this.checkNetwork(); // 监听网络状态
this.getSystemInfo(); // 获取系统设备信息、
+ this.getLocation(); // 获取当前位置信息
const token = this.$store.state.user.token || this.$storage.getStorageSync('anyringToken') || '';
if (token) {
@@ -177,6 +178,18 @@ export default {
});
},
+ getLocation() {
+ let that = this;
+
+ uni.getLocation({
+ type: 'wgs84',
+ success: function (res) {
+ that.$store.commit('setLongitude', res.longitude);
+ that.$store.commit('setLatitude', res.latitude);
+ }
+ });
+ },
+
// 登录
async signin() {
try {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cef71c5..d20f02e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.0.0 (2022-04-07)
+# 1.0.0 (2022-04-08)
### 🌟 新功能
范围|描述|commitId
@@ -153,6 +153,7 @@
- | 退出登录 | [6922f24](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6922f24)
- | 未登录时查询成员列表出错,导致角色任务获取出错问题 | [04fddb7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/04fddb7)
- | 向上查向下查 | [1933e1b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1933e1b)
+ - | 项目列表不能正常滚动 | [3c26b50](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3c26b50)
- | 项目列表排序 | [ad0ce75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ad0ce75)
- | 消息id | [f79918b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f79918b)
- | 小红点、上传项目刷新项目列表 | [02d933e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/02d933e)
diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue
index 6ba9b8b..2f91047 100644
--- a/components/Plugin/Plugin.vue
+++ b/components/Plugin/Plugin.vue
@@ -21,6 +21,7 @@
+
@@ -29,7 +30,7 @@
-
+
diff --git a/components/Render/Render.vue b/components/Render/Render.vue
index 3d9b6d5..4baa46d 100644
--- a/components/Render/Render.vue
+++ b/components/Render/Render.vue
@@ -18,6 +18,8 @@
:prop="pluginInfo"
:change:prop="projectRender.renderDom"
:data-url="domain"
+ :data-longitude="longitude"
+ :data-latitude="latitude"
>
@@ -42,7 +44,7 @@ export default {
},
computed: {
...mapState(['domain']),
- ...mapState(['allPlugin', 'businessPlugin']),
+ ...mapState(['allPlugin', 'businessPlugin', 'longitude', 'latitude']),
...mapState('role', ['roleId']),
...mapState('user', ['token']),
...mapGetters('project', ['projectId']),
diff --git a/manifest.json b/manifest.json
index 8b2bf0a..35f0dd5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,8 +1,8 @@
{
"name" : "时物链条2",
- "appid" : "__UNI__6207504",
+ "appid" : "__UNI__3CBCFFF",
"description" : "",
- "versionName" : "1.0.11",
+ "versionName" : "1.0.12",
"versionCode" : "100",
"transformPx" : false,
/* 5+App特有相关 */
diff --git a/plugins/p-deliver-second/p-deliver-second.vue b/plugins/p-deliver-second/p-deliver-second.vue
new file mode 100644
index 0000000..011f3e6
--- /dev/null
+++ b/plugins/p-deliver-second/p-deliver-second.vue
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/p-deliver-upload-second/p-deliver-upload-second.vue b/plugins/p-deliver-upload-second/p-deliver-upload-second.vue
new file mode 100644
index 0000000..927232a
--- /dev/null
+++ b/plugins/p-deliver-upload-second/p-deliver-upload-second.vue
@@ -0,0 +1,299 @@
+
+
+
+
+
+
+
+ {{ deliver.deliverName }}
+
+
+
+
+
+
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+ 粘贴
+ 文件
+ 拍照
+
+
+
+
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+ 交付物标题名称
+
+
+
+
+
+
+
+
+
+
+ 工作量时长
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/store/index.js b/store/index.js
index b39576a..93bf9e0 100644
--- a/store/index.js
+++ b/store/index.js
@@ -22,6 +22,8 @@ const state = {
allPlugin: '', // 所有插件
firstOpenApp: false, // 是否是第一次打开APP或者引导页有更新,false表示从未打开过,true表示打开过
isOpenApp: true, // 是否打开APP
+ longitude: '', // 经度
+ latitude: '', // 纬度
};
const getters = {
@@ -50,6 +52,24 @@ const mutations = {
setSystemInfo(state, data) {
state.systemInfo = data;
},
+
+ /**
+ * 设置当前位置经度
+ * @param {object} state
+ * @param {object | null} data 获取到的数据
+ */
+ setLongitude(state, data) {
+ state.longitude = data;
+ },
+
+ /**
+ * 设置当前位置纬度
+ * @param {object} state
+ * @param {object | null} data 获取到的数据
+ */
+ setLatitude(state, data) {
+ state.latitude = data;
+ },
/**
* 设置主题