Skip to content

S
site-uniapp
提交 bbe9cfe5 作者: wk
操作

流程优化处理

父级 50a85aa6
正在显示 包含 56 行增加 和 36 行删除
pages/gallery/app/addForm/addForm.vue
...@@ -480,7 +480,7 @@ ...@@ -480,7 +480,7 @@
delta: 1 delta: 1
}) })
uni.navigateTo({ uni.navigateTo({
url: `/pages/gallery/formDetailPage/formDetailPage?obj_no=${this.objNo}` url: `/pages/gallery/formDetail/formDetail?obj_no=${this.objNo}`
}) })
}, },
computeClick: function(index) { computeClick: function(index) {
......
pages/gallery/app/editAloneForm/editAloneForm.vue
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<view class="model-out-box"> <view class="model-out-box">
<view class="text-black-normal">提示</view> <view class="text-black-normal">提示</view>
<view class="model-content"> <view class="model-content">
<image src="../../static/successful.png" style="width: 100rpx;height: 100rpx;"></image> <image src="../../../../static/successful.png" style="width: 100rpx;height: 100rpx;"></image>
</view> </view>
<view class="text-black-normal" style="margin-bottom: 32rpx;">提交成功</view> <view class="text-black-normal" style="margin-bottom: 32rpx;">提交成功</view>
<view style="display: flex;flex-direction: row;width: 100%;"> <view style="display: flex;flex-direction: row;width: 100%;">
...@@ -412,7 +412,7 @@ ...@@ -412,7 +412,7 @@
delta: 1 delta: 1
}) })
uni.navigateTo({ uni.navigateTo({
url: `/pages/gallery/formDetailPage/formDetailPage?obj_no=${this.objNo}` url: `/pages/gallery/formDetail/formDetail?obj_no=${this.objNo}`
}) })
}, },
computeClick: function(index) { computeClick: function(index) {
......
pages/gallery/app/modeFormList/modeFormList.vue
...@@ -623,7 +623,7 @@ ...@@ -623,7 +623,7 @@
} }
if (this.businessType == 2) { if (this.businessType == 2) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/gallery/formDetailPage/formDetailPage?obj_no=${form.obj_no}` url: `/pages/gallery/formDetail/formDetail?obj_no=${form.obj_no}`
}) })
} else if (this.businessType == 3 || this.businessType == 4) { } else if (this.businessType == 3 || this.businessType == 4) {
//判断是否可编辑 未结束前的执行人可编辑 //判断是否可编辑 未结束前的执行人可编辑
......
pages/gallery/app/qrcodeList/qrcodeList.vue
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</template> </template>
<script> <script>
import uQRCode from "../../../../components/tki-qrcode/qrcode.js" import uQRCode from "../../../../common/Sansnn-uQRCode/uqrcode.js"
export default { export default {
data() { data() {
return { return {
......
pages/gallery/gallery.vue
...@@ -475,13 +475,12 @@ ...@@ -475,13 +475,12 @@
background: #fff; background: #fff;
display: flex; display: flex;
margin: 0 30rpx; margin: 0 30rpx;
padding: 0 30rpx;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
image { image {
width: 50rpx; width: 50rpx;
margin-right: 20rpx; margin: 0 20rpx;
height: 22px; height: 22px;
} }
...@@ -495,7 +494,7 @@ ...@@ -495,7 +494,7 @@
.rq-image { .rq-image {
width: 24rpx; width: 24rpx;
height: 16px; height: 16px;
margin: 0 10rpx 0 30rpx; margin: 0 20rpx;
} }
} }
......
pages/index/index.vue
...@@ -84,7 +84,8 @@ ...@@ -84,7 +84,8 @@
<swiper circular="true" :autoplay="true" class="swiper" :vertical="true"> <swiper circular="true" :autoplay="true" class="swiper" :vertical="true">
<swiper-item v-for="(item,index) in changeRecords" :key="index" class="item"> <swiper-item v-for="(item,index) in changeRecords" :key="index" class="item">
<view class="record"> <view class="record">
{{dealTimeDiff(item.created_at)}}前{{item.ex_worker_name}}兑换了{{item.goods_name}} <span class="span">{{dealTimeDiff(item.created_at)}}</span>
前{{item.ex_worker_name}}兑换了{{item.goods_name}}
</view> </view>
</swiper-item> </swiper-item>
</swiper> </swiper>
...@@ -217,7 +218,7 @@ ...@@ -217,7 +218,7 @@
}, },
fail() { fail() {
uni.redirectTo({ uni.redirectTo({
url: "/pages/login/login/login" url: "/pages/login/authLogin/authLogin"
}) })
} }
}) })
...@@ -248,13 +249,11 @@ ...@@ -248,13 +249,11 @@
uni.setStorageSync("org_name", this.project.project_name) uni.setStorageSync("org_name", this.project.project_name)
uni.setStorageSync("org_id", this.project.id) uni.setStorageSync("org_id", this.project.id)
uni.setStorageSync("project_id", this.project.project_id) uni.setStorageSync("project_id", this.project.project_id)
this.initData()
} }
} }
if (this.role == 'WORKER') { }, (err) => {
this.getGoodsList() this.$toast.showToast(err.msg)
this.getMyScore()
this.getChangeRecord()
}
}) })
}, },
getGoodsList() { getGoodsList() {
...@@ -279,6 +278,8 @@ ...@@ -279,6 +278,8 @@
} }
}) })
} }
}, (err) => {
this.$toast.showToast(err.msg)
}) })
}, },
add0(text) { add0(text) {
...@@ -358,7 +359,9 @@ ...@@ -358,7 +359,9 @@
} }
}).then((result) => { }).then((result) => {
if (result.code == 0) { if (result.code == 0) {
this.banners = result.data.list if (result.data.list.length > 0) {
this.banners = result.data.list
}
} else { } else {
this.$toast.showToast(result.msg) this.$toast.showToast(result.msg)
} }
...@@ -510,20 +513,7 @@ ...@@ -510,20 +513,7 @@
if (!this.project_id) { if (!this.project_id) {
this.loadProject() this.loadProject()
} else { } else {
if (this.role == 'WORKER') { this.initData()
this.project_id = this.userInfo.worker.projectId
this.getGoodsList()
this.getMyScore()
this.getChangeRecord()
uni.setStorageSync("org_no", this.userInfo.user.org_no)
uni.setStorageSync("org_name", this.userInfo.currentProject.projectName)
this.city = this.userInfo.currentProject.city
this.getWeather()
}
}
if (this.role != 'VISITOR') {
this.getNews()
this.getBanners()
} }
} else { } else {
this.$toast.showToast(result.msg) this.$toast.showToast(result.msg)
...@@ -532,6 +522,22 @@ ...@@ -532,6 +522,22 @@
this.$toast.showToast(err.msg) this.$toast.showToast(err.msg)
}) })
}, },
initData() {
if (this.role == 'WORKER') {
this.project_id = this.userInfo.worker.projectId
this.getGoodsList()
this.getMyScore()
this.getChangeRecord()
uni.setStorageSync("org_no", this.userInfo.user.org_no)
uni.setStorageSync("org_name", this.userInfo.currentProject.projectName)
this.city = this.userInfo.currentProject.city
this.getWeather()
}
if (this.role != 'VISITOR') {
this.getNews()
this.getBanners()
}
},
toLogin: function() { toLogin: function() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/login/login/login" url: "/pages/login/login/login"
...@@ -845,7 +851,7 @@ ...@@ -845,7 +851,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
border-radius: 30rpx; border-radius: 30rpx;
margin: 30rpx 30rpx 20rpx 30rpx; margin: 30rpx 30rpx 0 30rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 16rpx 30rpx; padding: 16rpx 30rpx;
align-items: center; align-items: center;
...@@ -900,7 +906,7 @@ ...@@ -900,7 +906,7 @@
padding: 30rpx; padding: 30rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 30rpx; border-radius: 30rpx;
margin: 0 30rpx; margin: 30rpx 30rpx 0 30rpx;
.tab-content { .tab-content {
display: flex; display: flex;
...@@ -1197,7 +1203,12 @@ ...@@ -1197,7 +1203,12 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 24rpx; font-size: 24rpx;
color: #FFAA44; color: #333333;
.span {
font-size: 24rpx;
color: #FFAA44;
}
} }
} }
} }
......
pages/login/login/login.vue
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
}, },
methods: { methods: {
register: function() { register: function() {
uni.redirectTo({ uni.navigateTo({
url: "/pages/login/register/register" url: "/pages/login/register/register"
}) })
}, },
......
pages/login/register/register.vue
...@@ -136,6 +136,8 @@ ...@@ -136,6 +136,8 @@
} else { } else {
this.$toast.showToast(result.msg) this.$toast.showToast(result.msg)
} }
}, (err) => {
this.$toast.showToast(err.msg)
}) })
}, },
login: function(account, password) { login: function(account, password) {
...@@ -173,6 +175,8 @@ ...@@ -173,6 +175,8 @@
icon: 'none' icon: 'none'
}) })
} }
}, (err) => {
this.$toast.showToast(err.msg)
}) })
}, },
bindLogin(account, password) { bindLogin(account, password) {
...@@ -206,6 +210,8 @@ ...@@ -206,6 +210,8 @@
icon: 'none' icon: 'none'
}) })
} }
}, (err) => {
this.$toast.showToast(err.msg)
}) })
}, },
get_key(data) { get_key(data) {
...@@ -229,6 +235,8 @@ ...@@ -229,6 +235,8 @@
icon: 'none' icon: 'none'
}) })
} }
}, (err) => {
this.$toast.showToast(err.msg)
}) })
}, },
toLogin: function() { toLogin: function() {
...@@ -237,8 +245,8 @@ ...@@ -237,8 +245,8 @@
url: "/pages/login/bindLogin/bindLogin?unique_token=" + his.unique_token url: "/pages/login/bindLogin/bindLogin?unique_token=" + his.unique_token
}) })
} else { } else {
uni.redirectTo({ uni.navigateBack({
url: "/pages/login/login/login" delta: 1
}) })
} }
}, },
...@@ -277,6 +285,8 @@ ...@@ -277,6 +285,8 @@
icon: 'none' icon: 'none'
}) })
} }
}, (err) => {
this.$toast.showToast(err.msg)
}) })
}, },
timeDown(num) { timeDown(num) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
Please register or to comment