This commit is contained in:
cclu 2025-03-14 18:54:46 +08:00
parent 8a32cda339
commit c75814b1e2
11 changed files with 2029 additions and 622 deletions

View File

@ -2,30 +2,26 @@
"pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/index",
"style":
{
"style": {
"navigationBarTitleText": "驿行畅旅",
"enablePullDownRefresh": true
}
},
{
"path": "pages/userCenter/userCenter",
"style":
{
"style": {
"navigationBarTitleText": "个人中心"
}
},
{
"path": "pages/register/register",
"style":
{
"style": {
"navigationBarTitleText": "授权"
}
},
{
"path": "pages/webview/webview",
"style":
{
"style": {
"navigationBarTitleText": "驿行畅旅"
}
}
@ -33,19 +29,16 @@
"subPackages": [ //
{
"root": "pages/authorityApproval",
"pages": [
{
"pages": [{
"path": "index",
"style":
{
"style": {
"navigationBarTitleText": "权限审批",
"enablePullDownRefresh": true
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "权限审批",
"enablePullDownRefresh": true
}
@ -54,32 +47,27 @@
},
{
"root": "pages/auditingPop",
"pages": [
{
"pages": [{
"path": "jointlySign",
"style":
{
"style": {
"navigationBarTitleText": "会签"
}
},
{
"path": "transfer",
"style":
{
"style": {
"navigationBarTitleText": "移交"
}
},
{
"path": "toExamine",
"style":
{
"style": {
"navigationBarTitleText": "审核"
}
},
{
"path": "reject",
"style":
{
"style": {
"navigationBarTitleText": "驳回"
}
}
@ -87,49 +75,42 @@
},
{
"root": "pages/settlementApproval",
"pages": [
{
"pages": [{
"path": "index",
"style":
{
"style": {
"navigationStyle": "custom"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "结算审批"
}
},
{
"path": "monthList",
"style":
{
"style": {
"navigationBarTitleText": "月度结算列表"
}
},
{
"path": "yearSettlement",
"style":
{
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "年度结算"
}
},
{
"path": "monthDetail",
"style":
{
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "月度详情"
}
},
{
"path": "dailyList",
"style":
{
"style": {
"navigationBarTitleText": "日结冲正明细"
}
}
@ -137,11 +118,9 @@
},
{
"root": "pages/operatingStatements",
"pages": [
{
"pages": [{
"path": "index",
"style":
{
"style": {
"navigationBarTitleText": "经营报表",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#647BD1",
@ -150,8 +129,7 @@
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "经营报表",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#647BD1",
@ -160,8 +138,7 @@
},
{
"path": "operatingTrend",
"style":
{
"style": {
"navigationBarTitleText": "经营趋势",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#647BD1",
@ -171,41 +148,57 @@
]
},
{
"root": "pages/tender",
"pages": [
"root": "pages/walkAroundManager",
"pages": [{
"path": "index",
"style": {
"navigationBarTitleText": "上传走动式管理"
}
},
{
"path": "statusPage",
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "detail",
"style": {
"navigationBarTitleText": "考核详情"
}
}
]
},
{
"root": "pages/tender",
"pages": [{
"path": "tender",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "招标投标"
}
},
{
"path": "tenderRecord",
"style":
{
"style": {
"navigationBarTitleText": "招标备案详情"
}
},
{
"path": "tenderAlteration",
"style":
{
"style": {
"navigationBarTitleText": "招标变更详情"
}
},
{
"path": "decisionRecord",
"style":
{
"style": {
"navigationBarTitleText": "决标备案详情"
}
},
{
"path": "specialProjects",
"style":
{
"style": {
"navigationBarTitleText": "专项工程详情",
"enablePullDownRefresh": false
}
@ -214,32 +207,27 @@
},
{
"root": "pages/mbwa",
"pages": [
{
"pages": [{
"path": "mbwa",
"style":
{
"style": {
"navigationBarTitleText": "走动式管理"
}
},
{
"path": "mbwaUnCheck",
"style":
{
"style": {
"navigationBarTitleText": "未检点位"
}
},
{
"path": "mbwaDetail",
"style":
{
"style": {
"navigationBarTitleText": "走动式管理"
}
},
{
"path": "mbwaUpload",
"style":
{
"style": {
"navigationBarTitleText": "上传走动式管理"
}
}
@ -247,19 +235,16 @@
},
{
"root": "pages/serviceAreaReimbursement",
"pages": [
{
"pages": [{
"path": "serviceAreaReimbursement",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "服务区报销"
}
},
{
"path": "detail",
"style":
{
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": ""
}
@ -268,27 +253,23 @@
},
{
"root": "pages/dataSummary",
"pages": [
{
"pages": [{
"path": "dataSummary",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "日结校验"
}
},
{
"path": "dayDetail",
"style":
{
"style": {
"navigationBarBackgroundColor": "#EAEBEB",
"navigationBarTitleText": "日结校验"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "日结校验"
}
}
@ -296,33 +277,28 @@
},
{
"root": "pages/askForLeave",
"pages": [
{
"pages": [{
"path": "askForLeave",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "请假加班"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "请假详情"
}
},
{
"path": "newLeave",
"style":
{
"style": {
"navigationBarTitleText": "申请请假"
}
},
{
"path": "newLeave2",
"style":
{
"style": {
"navigationBarTitleText": "申请请假"
}
}
@ -330,33 +306,28 @@
},
{
"root": "pages/officialDocManagement",
"pages": [
{
"pages": [{
"path": "officialDocManagement",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "公文阅办"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "公文阅办"
}
},
{
"path": "readerList",
"style":
{
"style": {
"navigationBarTitleText": "公文阅办"
}
},
{
"path": "circulate",
"style":
{
"style": {
"navigationBarTitleText": "阅办记录"
}
}
@ -364,41 +335,35 @@
},
{
"root": "pages/businessApproval",
"pages": [
{
"pages": [{
"path": "businessApproval",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "商品审批"
}
},
{
"path": "productDetail",
"style":
{
"style": {
"navigationBarTitleText": "商品审批"
}
},
{
"path": "newDetail",
"style":
{
"style": {
"navigationBarTitleText": "商品审批"
}
},
{
"path": "newApproval",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "商品审批"
}
},
{
"path": "transferPage",
"style":
{
"style": {
"navigationBarTitleText": ""
}
}
@ -406,51 +371,44 @@
},
{
"root": "pages/everdayRenven",
"pages": [
{
"pages": [{
"path": "index",
"style":
{
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "每日营收汇总"
}
},
{
"path": "detail",
"style":
{
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "每日营收"
}
},
{
"path": "serviceIndex",
"style":
{
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "服务区每日营收"
}
},
{
"path": "serviceDetail",
"style":
{
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "服务区每日营收"
}
},
{
"path": "AnhuiIndex",
"style":
{
"style": {
"navigationBarTitleText": "每日营收汇总",
"enablePullDownRefresh": false
}
},
{
"path": "AnhuiServerpart",
"style":
{
"style": {
"navigationBarTitleText": "服务区每日营收",
"enablePullDownRefresh": false
}
@ -459,19 +417,16 @@
},
{
"root": "pages/suggestion",
"pages": [
{
"pages": [{
"path": "suggestion",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "投诉建议"
}
},
{
"path": "suggestionDetail",
"style":
{
"style": {
"navigationBarTitleText": "投诉建议"
}
}
@ -479,8 +434,7 @@
},
{
"root": "pages/projectWarning",
"pages": [
{
"pages": [{
"path": "index",
"style": {
"navigationBarTitleText": "分润比例切换"
@ -498,19 +452,16 @@
},
{
"root": "pages/contract",
"pages": [
{
"pages": [{
"path": "contract",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "合同审批"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "合同审批"
}
}
@ -518,26 +469,22 @@
},
{
"root": "pages/cashAudit",
"pages": [
{
"pages": [{
"path": "list",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "收银稽核"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "收银稽核详情"
}
},
{
"path": "check",
"style":
{
"style": {
"navigationBarTitleText": "收银稽核反馈"
}
}
@ -545,19 +492,16 @@
},
{
"root": "pages/investment",
"pages": [
{
"pages": [{
"path": "investment",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "招商审批"
}
},
{
"path": "investmentDetail",
"style":
{
"style": {
"navigationBarTitleText": "招商审批"
}
}
@ -565,19 +509,16 @@
},
{
"root": "pages/publicity",
"pages": [
{
"pages": [{
"path": "publicity",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "阳光公示"
}
},
{
"path": "publicityDetail",
"style":
{
"style": {
"navigationBarTitleText": "阳光公示"
}
}
@ -585,19 +526,16 @@
},
{
"root": "pages/expenseApproval",
"pages": [
{
"pages": [{
"path": "expenseApproval",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "财务审批"
}
},
{
"path": "expenseDetail",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "财务审批"
}
@ -606,19 +544,16 @@
},
{
"root": "pages/commodity_temp",
"pages": [
{
"pages": [{
"path": "index",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "资质审批"
}
},
{
"path": "detail",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "资质审批"
}
@ -627,19 +562,16 @@
},
{
"root": "pages/autoTest/serverpartshoptotalsummary",
"pages": [
{
"pages": [{
"path": "index",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "业主门店数量汇总"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "业主门店数量汇总详情"
}
}
@ -647,19 +579,16 @@
},
{
"root": "pages/autoTest/shopmobilesummary",
"pages": [
{
"pages": [{
"path": "index",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "门店移动支付汇总"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "门店移动支付汇总详情"
}
}
@ -667,19 +596,16 @@
},
{
"root": "pages/autoTest/endaccountreport",
"pages": [
{
"pages": [{
"path": "index",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "服务区营收数据汇总"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "服务区营收数据汇总详情"
}
}
@ -687,19 +613,16 @@
},
{
"root": "pages/autoTest/abnormalauditreport",
"pages": [
{
"pages": [{
"path": "index",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "服务区现场稽核异常汇总"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "服务区现场稽核异常汇总详情"
}
}
@ -707,19 +630,16 @@
},
{
"root": "pages/autoTest/serverpartreport",
"pages": [
{
"pages": [{
"path": "index",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "服务区营收汇总"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "服务区营收汇总详情"
}
}
@ -727,19 +647,16 @@
},
{
"root": "pages/autoTest/abnormalauditsummary",
"pages": [
{
"pages": [{
"path": "index",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "现场稽核异常表服务区站点汇总"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "现场稽核异常表服务区站点汇总详情"
}
}
@ -747,19 +664,16 @@
},
{
"root": "pages/autoTest/abnormalaudit",
"pages": [
{
"pages": [{
"path": "index",
"style":
{
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "现场稽核异常表"
}
},
{
"path": "detail",
"style":
{
"style": {
"navigationBarTitleText": "现场稽核异常表详情"
}
}
@ -777,8 +691,7 @@
"selectedColor": "#3295f9",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"list": [
{
"list": [{
"pagePath": "pages/index/index",
"iconPath": "static/images/tab/home.png",
"selectedIconPath": "static/images/tab/homeActive.png",

View File

@ -1,19 +1,27 @@
<template>
<view class="content" v-show="menus">
<menuModel v-for="(menu ,index) in modelMenu" :key="index" :title="menu.name" :class="{'line-block':index!=0}">
<view class="uni-flex align-top" name="slot">
<menuItem
v-for="item in menu.list"
:key="item.id"
:item ="item"
:doCout="toDoMsg ? toDoMsg[item.id] : 0"
:active="item.id=='d5a9e3ef-3699-448f-abcc-819179df60bd' || menus[item.id]==1 || this.membershipType === 9999"
@handleClick="toPage"
></menuItem>
</view>
</menuModel>
<!-- <view class="home-model">
<view class="content" v-show="menus">
<menuModel
v-for="(menu, index) in modelMenu"
:key="index"
:title="menu.name"
:class="{ 'line-block': index != 0 }"
>
<view class="uni-flex align-top" name="slot">
<menuItem
v-for="item in menu.list"
:key="item.id"
:item="item"
:doCout="toDoMsg ? toDoMsg[item.id] : 0"
:active="
item.id == 'd5a9e3ef-3699-448f-abcc-819179df60bd' ||
menus[item.id] == 1 ||
this.membershipType === 9999
"
@handleClick="toPage"
></menuItem>
</view>
</menuModel>
<!-- <view class="home-model">
<div class="model-title">
<text class="text">综合办公</text>
</div>
@ -110,196 +118,212 @@
</div>
</view> -->
</view>
</view>
</template>
<script>
import {
mapState,
import { mapState, mapMutations, mapActions } from "vuex";
import modelMenu from "./components/menus.js";
import menuModel from "./components/menuModel.vue";
import menuItem from "./components/menuItem.vue";
export default {
data() {
return {
modelMenu: null,
membershipType: null,
};
},
components: {
menuModel,
menuItem,
},
onLoad() {
console.log(this.user, 1111);
this.loadMenuSetting();
},
computed: {
...mapState({
user: (state) => {
return {
UserId: state.userData.UserId,
UserName: state.userData.UserName,
Membership_Phone: state.userData.Membership_Phone,
Membership_Id: state.userData.Membership_Id,
Membership_Type: state.userData.Membership_Type,
};
},
toDoMsg: (state) => {
return state.toDoMsg;
},
menus: (state) => {
return state.userData.AuthorityInfo;
},
}),
},
methods: {
...mapActions(["updateUser"]),
scanCode() {
let _this = this;
uni.scanCode({
onlyFromCamera: true,
success: function (res) {
console.log("条码类型:" + res.scanType);
console.log("条码内容:" + res.result);
if (res.scanType.indexOf("QR_CODE") > -1) {
if (res.result.indexOf("pages/walkAroundManager/index") > -1) {
_this.$util.toNextRoute("navigateTo", "/" + res.result);
} else {
let result = res.result.toLocaleLowerCase();
if (
result.indexOf("http://eshangtech.com:8000/mbwa/index.html") >
-1
) {
let mbwaId = res.result.split("?")[1];
mbwaId = mbwaId.split("=")[1];
mapMutations,
mapActions
} from 'vuex'
import modelMenu from'./components/menus.js'
import menuModel from'./components/menuModel.vue'
import menuItem from'./components/menuItem.vue'
export default {
data() {
return {
modelMenu: null,
membershipType: null
}
},
components:{
menuModel,
menuItem
},
onLoad() {
console.log(this.user,1111)
this.loadMenuSetting()
},
computed: {
...mapState({
user: (state)=>{
return {
UserId: state.userData.UserId,
UserName: state.userData.UserName,
Membership_Phone: state.userData.Membership_Phone,
Membership_Id: state.userData.Membership_Id,
Membership_Type: state.userData.Membership_Type
}
},
toDoMsg: (state)=>{
return state.toDoMsg
},
menus: (state)=> {
return state.userData.AuthorityInfo
}
}),
_this.$util.toNextRoute(
"navigateTo",
"/pages/mbwa/mbwaUpload?mbwaID=" + mbwaId
);
} else if (res.result.indexOf("http") > -1) {
_this.$util.toNextRoute(
"navigateTo",
"/pages/webview/webview?src=" + encodeURIComponent(res.result)
);
} else {
let invoice = res.result.split(",");
// console.log(invoice.length)
if (invoice.length == 9) {
_this.$util.toNextRoute(
"navigateTo",
"/pages/invoice/invoice?invoice=" + invoice
);
} else {
uni.showModal({
title: "温馨提示",
content: "不识别该二维码,请扫描发票或商品条形码",
showCancel: false,
confirmText: "确定",
});
}
}
}
} else if (res.scanType.indexOf("EAN_13") > -1) {
this.$util.toNextRoute(
"navigateTo",
"/pages/commodtity/commodtity?commodtity=" + res.result
);
} else {
uni.showModal({
title: "温馨提示",
content: "不识别该二维码,请扫描发票或商品条形码",
showCancel: false,
confirmText: "确定",
});
}
},
});
},
recordBrowsing(item) {
//
let _this = this;
if (!item.id) {
uni.showModal({
title: " 温馨提示",
content: "该模块正在开发,尽请期待",
});
} else if (
_this.menus &&
(_this.menus[item.id] == 1 || this.user.Membership_Type === 9999)
) {
// 访
// } else {
this.$util.toNextRoute("navigateTo", item.homeUrl);
} else if (this.user.Membership_Type !== 9999) {
uni.showToast({
title: "您没有该模块权限,请联系管理员",
icon: "none",
});
}
},
toPage(item) {
console.log("item", item);
let _this = this;
},
methods: {
...mapActions(['updateUser']),
scanCode() {
let _this = this
uni.scanCode({
onlyFromCamera: true,
success: function(res) {
console.log('条码类型:' + res.scanType)
console.log('条码内容:' + res.result)
if (res.scanType.indexOf("QR_CODE") > -1) {
let result = res.result.toLocaleLowerCase()
if (result.indexOf('http://eshangtech.com:8000/mbwa/index.html') > -1) {
let mbwaId = res.result.split('?')[1]
mbwaId = mbwaId.split('=')[1]
_this.$util.toNextRoute('navigateTo', "/pages/mbwa/mbwaUpload?mbwaID=" + mbwaId)
} else if (res.result.indexOf("http") > -1) {
_this.$util.toNextRoute('navigateTo', "/pages/webview/webview?src=" +
encodeURIComponent(res.result))
} else {
let invoice = res.result.split(",")
// console.log(invoice.length)
if (invoice.length == 9) {
_this.$util.toNextRoute('navigateTo', "/pages/invoice/invoice?invoice=" + invoice)
} else {
uni.showModal({
title: "温馨提示",
content: "不识别该二维码,请扫描发票或商品条形码",
showCancel: false,
confirmText: "确定"
})
}
}
} else if (res.scanType.indexOf("EAN_13") > -1) {
this.$util.toNextRoute('navigateTo', "/pages/commodtity/commodtity?commodtity=" + res.result)
} else {
uni.showModal({
title: "温馨提示",
content: "不识别该二维码,请扫描发票或商品条形码",
showCancel: false,
confirmText: "确定"
})
}
}
})
},
recordBrowsing(item) { //
let _this = this
if (!item.id) {
uni.showModal({
title: ' 温馨提示',
content: '该模块正在开发,尽请期待',
})
} else if (_this.menus && (_this.menus[item.id] == 1 ||
this.user.Membership_Type === 9999)) { // 访
// } else {
this.$util.toNextRoute('navigateTo', item.homeUrl)
} else if (this.user.Membership_Type !== 9999) {
uni.showToast({
title: '您没有该模块权限,请联系管理员',
icon: 'none'
})
}
},
toPage(item) {
console.log('item',item)
let _this = this
if (!this.user.Membership_Phone) {
uni.showModal({
title: ' 温馨提示',
content: '您还没有登录,快去登录吧!',
success(res) {
if (res.confirm) {
_this.$util.toNextRoute('navigateTo', '/pages/register/register')
}
}
})
}else if(item.id=='d5a9e3ef-3699-448f-abcc-819179df60bd') { //
this.scanCode()
} else if (this.user.UserId == '') {
uni.showModal({
title: ' 温馨提示',
content: '您的账户未绑定综管平台账户,请先绑定以获取业务权限',
success(res) {
if (res.confirm) {
_this.$util.toNextRoute('navigateTo', '/pages/bindingBack/bindingBack')
}
}
})
} else {
this.recordBrowsing(item)
}
},
async loadMenuSetting(){ //
console.log('this.user',this.user)
this.membershipType = this.user.Membership_Type
let res = await this.$request.$webGet("EShangApiMain/APPManage/GetWeChatAppletMenuList",{
ModuleStatus: this.membershipType === 9999 ? '1,2' : '1',
AppletMenuStatus: this.membershipType === 9999 ? '1,2' : '1'
})
this.modelMenu = res.Result_Data.List
}
},
onReady() {
},
onShow() {
},
onPullDownRefresh() {
let _this = this
this.updateUser()
this.loadMenuSetting()
setTimeout(function() {
uni.stopPullDownRefresh()
}, 1000)
},
onTabItemTap(e) {
this.$util.addUserBehaviorNew({
outtoRoute: '/pages/index/index',
intoRoute: '/pages/userCenter/userCenter'
})
}
}
if (!this.user.Membership_Phone) {
uni.showModal({
title: " 温馨提示",
content: "您还没有登录,快去登录吧!",
success(res) {
if (res.confirm) {
_this.$util.toNextRoute("navigateTo", "/pages/register/register");
}
},
});
} else if (item.id == "d5a9e3ef-3699-448f-abcc-819179df60bd") {
//
this.scanCode();
} else if (this.user.UserId == "") {
uni.showModal({
title: " 温馨提示",
content: "您的账户未绑定综管平台账户,请先绑定以获取业务权限",
success(res) {
if (res.confirm) {
_this.$util.toNextRoute(
"navigateTo",
"/pages/bindingBack/bindingBack"
);
}
},
});
} else {
this.recordBrowsing(item);
}
},
async loadMenuSetting() {
//
console.log("this.user", this.user);
this.membershipType = this.user.Membership_Type;
let res = await this.$request.$webGet(
"EShangApiMain/APPManage/GetWeChatAppletMenuList",
{
ModuleStatus: this.membershipType === 9999 ? "1,2" : "1",
AppletMenuStatus: this.membershipType === 9999 ? "1,2" : "1",
}
);
this.modelMenu = res.Result_Data.List;
},
},
onReady() {},
onShow() {},
onPullDownRefresh() {
let _this = this;
this.updateUser();
this.loadMenuSetting();
setTimeout(function () {
uni.stopPullDownRefresh();
}, 1000);
},
onTabItemTap(e) {
this.$util.addUserBehaviorNew({
outtoRoute: "/pages/index/index",
intoRoute: "/pages/userCenter/userCenter",
});
},
};
</script>
<style scoped>
.line-block {
border-top: 13rpx solid #F5F5F5;
}
.content {
display: flex;
flex-direction: column;
justify-content: center;
}
.uni-flex {
align-items: center;
flex-wrap: wrap;
}
.line-block {
border-top: 13rpx solid #f5f5f5;
}
.content {
display: flex;
flex-direction: column;
justify-content: center;
}
.uni-flex {
align-items: center;
flex-wrap: wrap;
}
</style>

View File

@ -1,23 +1,37 @@
<template>
<view class="content">
<view>
<image src="https://eshangtech.com/ShopICO/yxcl-register-pht.png" mode="aspectFit"></image>
<image
src="https://eshangtech.com/ShopICO/yxcl-register-pht.png"
mode="aspectFit"
></image>
<view v-if="showBtn">
<view class="desc" v-if="!user.WeChat_UserId">
<!-- <view class="desc">申请获取你的公开信息(昵称头像)</view> -->
<!-- <button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">微信授权</button>-->
<button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">手机号授权</button>
<!-- <button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">微信授权</button>-->
<button
type="primary"
class="btn"
open-type="getUserInfo"
@getuserinfo="bindGetUserInfo"
>
手机号授权
</button>
</view>
<view class="desc" v-else>
<button type="primary" class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">快速登录账号</button>
<button
type="primary"
class="btn"
open-type="getPhoneNumber"
@getphonenumber="getPhoneNumber"
>
快速登录账号
</button>
</view>
</view>
</view>
<view class="login-tip-text">
该小程序仅供企业内部人员登录使用<br/>您的手机号是核实身份的唯一凭证
该小程序仅供企业内部人员登录使用<br />您的手机号是核实身份的唯一凭证
</view>
<view class="privacyMeng" v-if="showPrivacy"></view>
@ -25,76 +39,87 @@
<view class="privacyContent">
<p class="contentTitle">用户隐私保护提示</p>
<view class="contentWord">
感谢您使用本产品您使用本产品前应当仔细阅读并同意<text class="tips" @click="handleOpenPrivacyContract">小程序隐私保护指引</text>
感谢您使用本产品您使用本产品前应当仔细阅读并同意<text
class="tips"
@click="handleOpenPrivacyContract"
>小程序隐私保护指引</text
>
当您点击同意并开始使用产品服务时即表示您已理解并同意该条款内容该条款将对您产生法律约束如您拒绝将无法更好的体验产品
</view>
</view>
<view class="btnList">
<button class="btns noAgree" @click="handleRefuse">拒绝</button>
<button class="btns agree" id="agree-btn3" open-type="agreePrivacyAuthorization" @agreeprivacyauthorization="handleAgreePrivacyAuthorization">同意</button>
<button
class="btns agree"
id="agree-btn3"
open-type="agreePrivacyAuthorization"
@agreeprivacyauthorization="handleAgreePrivacyAuthorization"
>
同意
</button>
</view>
</view>
</view>
</template>
<script>
import { mapActions, mapGetters,mapMutations } from 'vuex'
import { mapActions, mapGetters, mapMutations } from "vuex";
export default {
data() {
return {
shouldNavback: false,
showPrivacy:false,// 西
showBtn:false,//
}
showPrivacy: false, // 西
showBtn: false, //
};
},
computed:{
computed: {
...mapGetters({
'user':'getUser',
})
user: "getUser",
}),
},
onLoad(option) {
let _this = this
let _this = this;
wx.getPrivacySetting({
success: res=>{
console.log('res123123',res)
if (res.needAuthorization){
_this.showPrivacy = true
}else{
_this.showBtn = true
success: (res) => {
console.log("res123123", res);
if (res.needAuthorization) {
_this.showPrivacy = true;
} else {
_this.showBtn = true;
// if (this.user.WeChat_MiniProToken) {
// this.memberLogin()
// } else {
// this.getLoginCode()
// }
}
}
})
if(option.source=='detail'){
this.shouldNavback = true
},
});
if (option.source == "detail") {
this.shouldNavback = true;
}
},
methods: {
...mapActions(['updateUser']),
...mapMutations(['setUser']),
...mapActions(["updateUser"]),
...mapMutations(["setUser"]),
//
handleOpenPrivacyContract(){
handleOpenPrivacyContract() {
wx.openPrivacyContract({
success: (success) => {
console.log('success',success)
console.log("success", success);
}, //
fail: () => {}, //
complete: () => {}
})
complete: () => {},
});
},
//
handleAgreePrivacyAuthorization(e){
console.log('e1',e)
this.showPrivacy = false
this.showBtn = true
handleAgreePrivacyAuthorization(e) {
console.log("e1", e);
this.showPrivacy = false;
this.showBtn = true;
},
//
handleRefuse(){
this.showPrivacy = false
handleRefuse() {
this.showPrivacy = false;
},
// //
// handleGetUserInfo(e){
@ -138,81 +163,86 @@ export default {
// })
// }
// },
getPhoneNumber (e) {
console.log(e)
getPhoneNumber(e) {
console.log(e);
uni.showLoading({
title:'正在加载...',
mask:true
})
let _this = this
let _data = e.mp.detail
let user = _this.user
title: "正在加载...",
mask: true,
});
let _this = this;
let _data = e.mp.detail;
let user = _this.user;
let arr = {
encryptedData: encodeURIComponent(_data.encryptedData),
iv: encodeURIComponent(_data.iv)
}
iv: encodeURIComponent(_data.iv),
};
// _this.$request.$webPost('WebAPI_Push/WeChat/BusinessPhone',arr).then(function (rs) {
_this.$request.$get('WeChat_BusinessPhone',arr).then(function (rs) {
console.log('rs',rs)
uni.hideLoading()
_this.$request.$get("WeChat_BusinessPhone", arr).then(function (rs) {
console.log("rs", rs);
uni.hideLoading();
if (rs.Result_Code === 100) {
_this.setUser(rs.Result_Data)
_this.updateUserFn(rs.Result_Data)
_this.$util.toNextRoute('switchTab', '/pages/index/index')
_this.setUser(rs.Result_Data);
_this.updateUserFn(rs.Result_Data);
_this.$util.toNextRoute("switchTab", "/pages/index/index");
// uni.switchTab({url: '/pages/index/index'})
} else {
uni.showToast({title: rs.Result_Desc || '服务器错误,请联系管理员。', icon: 'none'})
uni.showToast({
title: rs.Result_Desc || "服务器错误,请联系管理员。",
icon: "none",
});
}
})
});
},
async updateUserFn(data) {
this.updateUser(data)
this.updateUser(data);
},
bindGetUserInfo (e) { //
console.log('e',e)
let _this = this
let user = _this.user
bindGetUserInfo(e) {
//
console.log("e", e);
let _this = this;
let user = _this.user;
if (e.mp.detail) {
uni.showLoading({
title:'正在加载...',
mask:true
})
const res = e.mp.detail
title: "正在加载...",
mask: true,
});
const res = e.mp.detail;
let arr = {
encryptedData: encodeURIComponent(res.encryptedData),
iv: encodeURIComponent(res.iv),
}
requestType: "application/x-www-form-urlencoded",
};
// _this.$request.$webPost('WebAPI_Push/WeChat/BusinessLicensed',arr).then(function (rs) {
_this.$request.$get('WeChat_BusinessLicensed',arr).then(function (rs) {
uni.hideLoading()
if(rs.Result_Code==100){
let newUser = rs.Result_Data
newUser.WeChat_MiniProToken = _this.user.WeChat_MiniProToken
_this.setUser(newUser)
if(newUser.Membership_Phone) {
_this.updateUser(newUser)
_this.$util.toNextRoute('switchTab', '/pages/index/index')
// uni.reLaunch({url: '/pages/index/index'})
}else{
_this.$request.$get("WeChat_BusinessLicensed", arr).then(function (rs) {
uni.hideLoading();
console.log("rs", rs);
if (rs.Result_Code == 100) {
let newUser = rs.Result_Data;
newUser.WeChat_MiniProToken = _this.user.WeChat_MiniProToken;
_this.setUser(newUser);
if (newUser.Membership_Phone) {
_this.updateUser(newUser);
_this.$util.toNextRoute("switchTab", "/pages/index/index");
// uni.reLaunch({url: '/pages/index/index'})
} else {
}
_this.$forceUpdate()
}else{
_this.$forceUpdate();
} else {
uni.showToast({
title: rs.ResultDesc,
icon: 'none',
duration:2000
})
icon: "none",
duration: 2000,
});
}
})
});
}
}
},
},
onUnload() {
this.$util.addUserBehaviorNew()
this.$util.addUserBehaviorNew();
},
}
};
</script>
<style scoped lang="scss">
@ -244,18 +274,17 @@ image {
text-align: center;
font-size: 26rpx;
color: #888;
}
.privacyMeng{
.privacyMeng {
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
background: rgba(0,0,0,0.3);
background: rgba(0, 0, 0, 0.3);
z-index: 999998;
}
.privacy{
.privacy {
position: fixed;
bottom: 0;
width: 100vw;
@ -265,43 +294,43 @@ image {
border-top-right-radius: 24px;
border-top-left-radius: 24px;
background: #fff;
.privacyContent{
.contentTitle{
.privacyContent {
.contentTitle {
font-size: 48rpx;
font-family: Source Han Sans CN-Bold, Source Han Sans CN;
font-weight: bold;
color: #000000;
line-height: 56rpx;
}
.contentWord{
.contentWord {
margin-top: 32rpx;
text-indent: 2em;
.tips {
font-size: 28rpx;
font-family: Source Han Sans CN-Normal, Source Han Sans CN;
font-weight: 400;
color: #8BC21F;
color: #8bc21f;
line-height: 33rpx;
}
}
}
.btnList{
.btnList {
display: flex;
justify-content: space-evenly;
align-items: center;
margin-top: 48rpx;
.btns{
.btns {
display: inline-block;
padding: 0 90rpx;
border-radius: 15rpx;
}
.noAgree{
background: rgb(242,242,242);
color: rgb(26,187,107);
.noAgree {
background: rgb(242, 242, 242);
color: rgb(26, 187, 107);
font-weight: 600;
}
.agree{
background: rgb(26,187,107);
.agree {
background: rgb(26, 187, 107);
color: #fff;
font-weight: 600;
}

View File

@ -0,0 +1,458 @@
<template>
<view class="main">
<div class="pageHeader">
<div class="hederContent">
<img :src="user.Membership_Headimage" alt="" />
<div>
<p>{{ detailObj.userName || "" }}</p>
<p class="fs12">巡查人员</p>
</div>
</div>
</div>
<div class="addressBox">
<div class="contentBox">
<image
src="/static/images/publicity/dingwei.png"
mode="aspectFit"
class="addressIcon"
></image>
<div>
<p class="xuncha address">{{ detailObj.template.title || "-" }}</p>
<div>
<span>巡查时间</span><span>{{ detailObj.createdAt }}</span>
</div>
</div>
</div>
</div>
<div class="formBox">
<ul>
<li>
<span
:class="
inputfocus
? 'circle circleActive circle-first '
: 'circle circleActive circle-first'
"
></span>
<div class="examineContent">
<div class="titleBox">
<i :class="inputfocus ? 'img-zds activezds' : 'img-zds'"></i>
<div
:class="inputfocus ? 'titleTextActive' : 'titleText'"
style="display: flex"
>
<i style="color: red; margin-right: 5px">*</i>巡查内容
</div>
</div>
<div class="inputBox">
<textarea
auto-height
v-model="uploadResult"
placeholder="请输入巡查内容"
disabled
></textarea>
</div>
<div class="tagList" v-for="(tags, i) in tagList" :key="i">
<div class="tagName">
<span
style="display: inline-block; max-width: calc(100% - 10rpx)"
>
{{ tags.question.title || "" }}
</span>
<span v-if="tags.isRequired" style="color: red">*</span>
</div>
<div class="tagsBox">
<div
v-for="(tag, s) in tags.choiceResponse"
:key="s"
class="tagUnit active"
>
{{ tag }}
</div>
</div>
<!-- <div class="tagsBox">
<div
v-for="(tag, s) in tags.question.options"
:key="s"
@tap="selectTag(tag, tags.question)"
:class="tag.ischecked ? 'tagUnit active ' : 'tagUnit'"
>
{{ tag.text }}
</div>
</div> -->
</div>
</div>
</li>
<li>
<span :class="imgfocus ? 'circleActive' : 'circleActive'"></span>
<div class="examineContent">
<div class="titleBox">
<i
:class="
imgfocus
? 'img-upload activeupload'
: 'img-upload activeupload'
"
></i>
<div
style="display: flex"
:class="imgfocus ? 'titleTextActive' : 'titleTextActive'"
>
<i style="color: red; margin-right: 5px">*</i>请上传现场图片
</div>
</div>
<div class="uploadBox">
<div
class="uploadList"
v-for="(item, index) in imgsList"
:key="index"
>
<image :src="item" @tap="showImg2(index)" mode="aspectFill" />
</div>
</div>
</div>
</li>
</ul>
</div>
</view>
</template>
<script>
import { mapGetters } from "vuex";
export default {
data() {
let nowTime = this.$util.cutDate(new Date(), "hh:mm:ss");
return {
now_time: nowTime,
inputfocus: true, //
uploadResult: "", //
tagList: [], //
imgfocus: false, //
radiofocus: false, //
options: [
{
name: "情况正常",
value: "0",
},
{
name: "急需处理",
value: "2",
},
],
value: "0",
current: 0,
selectAnwersList: [], //
selectAnwersObj: {}, // id: [12]
detailObj: {}, //
imgsList: [],
submit: false, //
requiredList: [], //
};
},
computed: {
...mapGetters({
user: "getUser",
}),
},
onLoad(query) {
console.log("query", query);
this.handleGetDetail(query.id);
},
methods: {
async handleGetDetail(id) {
const data = await this.$request.$webNodeGet(
`questionnaire-responses/${id}`
);
let obj = data.data;
console.log("obj", obj);
this.detailObj = obj;
this.tagList = obj.questionResponses;
console.log("this.tagList", this.tagList);
if (obj.extend) {
let extend = JSON.parse(obj.extend);
this.uploadResult = extend.uploadResult;
this.imgsList = extend.imgsList;
}
},
},
};
</script>
<style lang="less" scoped>
.main {
width: 100%;
// height: 100vh;
background-color: #fff;
box-sizing: border-box;
padding-bottom: env(safe-area-inset-bottom); /* 兼容 iOS 11.2+ */
padding-bottom: constant(safe-area-inset-bottom);
.pageHeader {
height: 120rpx;
width: 100%;
background-color: rgb(246, 246, 246);
box-shadow: rgb(214, 207, 207) 4rpx 0px 20rpx;
background: url("../../static/images/mbwa/bj_logo.png") no-repeat bottom
right;
background-size: 34%;
padding-left: 30rpx;
box-sizing: border-box;
.hederContent {
display: flex;
align-items: center;
img {
width: 100rpx;
height: 100rpx;
border-radius: 50%;
margin-top: 10rpx;
margin-right: 20rpx;
}
}
}
.addressBox {
color: #727272;
padding: 30rpx;
.contentBox {
display: flex;
.addressIcon {
display: inline-block;
width: 49rpx;
height: 48rpx;
border-radius: 10rpx;
margin-right: 6rpx;
}
.xuncha {
font-size: 26rpx;
color: #1b1c20;
}
}
}
.formBox {
position: relative;
margin-left: 24rpx;
box-sizing: border-box;
ul {
li {
width: 100%;
position: relative;
margin-top: 16rpx;
.circle {
background-color: #b2b2b2;
height: 16rpx;
width: 16rpx;
border-radius: 50%;
position: absolute;
top: 16rpx;
left: 1rpx;
}
.circle-first {
top: 14rpx;
}
.circle-last {
top: 46rpx;
}
.circleActive {
height: 16rpx;
width: 16rpx;
border-radius: 50%;
position: absolute;
left: 1rpx;
top: 18rpx;
background-color: #409eff;
}
.examineContent {
width: 100%;
box-sizing: border-box;
padding-left: 40rpx;
.titleBox {
display: flex;
align-items: center;
.img-zds {
display: inline-block;
width: 32rpx;
height: 32rpx;
background: url("../../static/images/mbwa/content_img_gray.png")
no-repeat center;
background-size: contain;
margin-right: 6rpx;
}
.img-upload {
display: inline-block;
width: 32rpx;
height: 32rpx;
background: url("../../static/images/mbwa/pic_img_gray.png")
no-repeat center;
background-size: contain;
margin-right: 6rpx;
}
.activezds {
background-image: url("../../static/images/mbwa/zdsgl_sm_nr.png");
}
.activeupload {
background-image: url("../../static/images/mbwa/zdsgl_sm_pic.png");
}
.titleText {
font-size: 26rpx;
color: #7a7a7a;
}
.titleTextActive {
font-size: 26rpx;
color: #409eff;
}
}
.inputBox {
color: #939393;
font-size: 24rpx;
padding-bottom: 40rpx;
width: 100%;
box-sizing: border-box;
textarea {
min-height: 50rpx;
font-size: 24rpx;
line-height: 1.8;
border-bottom: 1rpx solid #eee;
margin-top: 20rpx;
color: #727272;
}
}
.tagList {
display: flex;
font-size: 24rpx;
color: #606266;
width: 100%;
box-sizing: border-box;
.tagName {
width: 200rpx;
margin-right: 16rpx;
font-size: 22rpx;
line-height: 2.9;
}
.tagsBox {
width: calc(100% - 200rpx);
// width: 546rpx;
padding: 0 24rpx 0 12rpx;
}
.tagUnit {
padding: 4rpx 16rpx;
background-color: #f4f4f4;
color: #606266;
border-radius: 24rpx;
margin: 8rpx;
font-size: 22rpx;
display: inline-block;
vertical-align: middle;
}
.active {
color: #ed7043;
background-color: #fdf1ec;
}
}
.uploadBox {
display: flex;
flex-flow: row wrap;
justify-content: flex-start;
align-items: flex-start;
width: 100%;
box-sizing: border-box;
padding: 20rpx 0;
/* padding-left: 54rpx; */
min-height: 160rpx;
.uploadList {
position: relative;
display: flex;
flex-flow: row nowrap;
justify-content: center;
align-items: center;
background-color: #f1f1f1;
box-sizing: border-box;
width: 160rpx;
height: 160rpx;
border-radius: 6rpx;
margin-top: 16rpx;
}
.uploadList:nth-child(3n-1) {
margin-left: 16rpx;
margin-right: 16rpx;
}
.uploadList image {
width: 160rpx;
height: 160rpx;
border-radius: 6rpx;
}
.uploadAdd {
width: 26%;
box-sizing: border-box;
.upload-file-add-container {
display: flex;
flex-flow: column nowrap;
justify-content: center;
align-items: center;
border: 1rpx dashed #c6c6c6;
height: 160rpx;
width: 160rpx;
margin-top: 15rpx;
border-radius: 6rpx;
margin-left: 12rpx;
.walk-manage-plus {
line-height: 60rpx;
width: 62rpx;
height: 62rpx;
text-align: center;
border-radius: 50%;
background-color: #409eff;
color: #ffffff;
font-size: 48rpx;
box-shadow: 0 2rpx 6rpx 0 #eee;
}
}
}
}
.uni-list-cell {
justify-content: unset;
margin-top: 28rpx;
}
.uni-list-cell:after {
background-color: #f9f9f9;
}
}
}
.active .img-zds {
background-image: url("../../static/images/mbwa/zdsgl_sm_nr.png");
}
}
.btn {
width: 80%;
margin: 0 auto;
margin-top: 50rpx;
background-color: #409eff;
border-radius: 10rpx;
color: #fff;
font-size: 28rpx;
line-height: 2.8;
margin-top: 96rpx;
}
}
}
</style>

View File

@ -0,0 +1,857 @@
<template>
<view class="main">
<div class="pageHeader">
<div class="hederContent">
<img :src="user.Membership_Headimage" alt="" />
<div>
<p>{{ user.Membership_Name || "" }}</p>
<p class="fs12">巡查人员</p>
</div>
</div>
</div>
<div class="addressBox">
<div class="contentBox">
<image
src="/static/images/publicity/dingwei.png"
mode="aspectFit"
class="addressIcon"
></image>
<div>
<p class="xuncha address">{{ detailObj.title || "-" }}</p>
<div>
<span>巡查时间</span><span>{{ now_time }}</span>
</div>
</div>
</div>
</div>
<div class="formBox">
<ul>
<li>
<span
:class="
inputfocus
? 'circle circleActive circle-first '
: 'circle circle-first'
"
></span>
<div class="examineContent">
<div class="titleBox">
<i :class="inputfocus ? 'img-zds activezds' : 'img-zds'"></i>
<div
:class="inputfocus ? 'titleTextActive' : 'titleText'"
style="display: flex"
>
<i style="color: red; margin-right: 5px">*</i>巡查内容
</div>
</div>
<div class="inputBox">
<textarea
auto-height
v-model="uploadResult"
placeholder="请输入巡查内容"
focus="true"
@focus="inputfocus = true"
@blur="inputfocus = false"
></textarea>
</div>
<div class="tagList" v-for="(tags, i) in tagList" :key="i">
<div class="tagName">
<span
style="display: inline-block; max-width: calc(100% - 10rpx)"
>
{{ tags.question.title || "" }}
</span>
<span v-if="tags.isRequired" style="color: red">*</span>
</div>
<div class="tagsBox">
<div
v-for="(tag, s) in tags.question.options"
:key="s"
@tap="selectTag(tag, tags.question)"
:class="tag.ischecked ? 'tagUnit active ' : 'tagUnit'"
>
{{ tag.text }}
</div>
</div>
</div>
</div>
</li>
<li>
<span :class="imgfocus ? 'circleActive' : 'circle'"></span>
<div class="examineContent">
<div class="titleBox">
<i
:class="imgfocus ? 'img-upload activeupload' : 'img-upload'"
></i>
<div
style="display: flex"
:class="imgfocus ? 'titleTextActive' : 'titleText'"
>
<i style="color: red; margin-right: 5px">*</i>请上传现场图片
</div>
</div>
<div class="uploadBox">
<div
class="uploadList"
v-for="(item, index) in imgsList"
:key="index"
>
<span
class="upload-file-remove"
@click.stop="deleteImgFunc(item, index)"
>×</span
>
<image :src="item" @tap="showImg2(index)" mode="aspectFill" />
</div>
<div class="uploadAdd" @click="submitImg">
<div class="upload-file-add-container">
<span class="walk-manage-plus">+</span>
</div>
</div>
</div>
</div>
</li>
<!-- <li>
<span
:class="
radiofocus
? 'circle circleActive circle-last'
: 'circle circle-last'
"
></span>
<div class="examineContent">
<radio-group
@change="radioChange"
style="display: flex"
@click="radioFocus"
@blur="radiofocus = false"
>
<label
class="uni-list-cell"
v-for="(item, index) in options"
:key="item.value"
>
<view>
<radio
:value="item.value"
color="#409eff"
:checked="index === current"
style="transform: scale(0.8)"
/>
</view>
<view>{{ item.name }}</view>
</label>
</radio-group>
</div>
</li> -->
</ul>
<button v-if="!submit" class="btn" @click="submitUpload">提交</button>
</div>
</view>
</template>
<script>
import { mapGetters } from "vuex";
export default {
data() {
let nowTime = this.$util.cutDate(new Date(), "hh:mm:ss");
return {
now_time: nowTime,
inputfocus: true, //
uploadResult: "", //
tagList: [], //
imgfocus: false, //
radiofocus: false, //
options: [
{
name: "情况正常",
value: "0",
},
{
name: "急需处理",
value: "2",
},
],
value: "0",
current: 0,
selectAnwersList: [], //
selectAnwersObj: {}, // id: [12]
detailObj: {}, //
imgsList: [],
submit: false, //
requiredList: [], //
};
},
computed: {
...mapGetters({
user: "getUser",
}),
},
onLoad(query) {
this.handleGetModalData(query.id);
},
methods: {
//
deleteImgFunc(item, index) {
this.imgsList.splice(index, 1);
},
//
async submitUpload() {
console.log("user", this.user);
console.log("this.detailObj", this.detailObj);
if (!this.uploadResult) {
uni.showToast({
title: "请输入巡查内容!",
icon: "none",
});
return;
}
console.log("selectAnwersList", this.selectAnwersList);
console.log("selectAnwersObj", this.selectAnwersObj);
console.log("requiredList", this.requiredList);
if (this.selectAnwersList && this.selectAnwersList.length > 0) {
let isAllRequired = true;
if (this.requiredList && this.requiredList.length > 0) {
this.requiredList.forEach((item) => {
if (
this.selectAnwersObj[item] &&
this.selectAnwersObj[item][0].ischecked
) {
} else {
isAllRequired = false;
}
});
}
console.log("isAllRequired", isAllRequired);
if (!isAllRequired) {
uni.showToast({
title: "考核结果未填写完全!",
icon: "none",
});
return;
}
// if (this.selectAnwersList.length !== this.tagList.length) {
// uni.showToast({
// title: "",
// icon: "none",
// });
// return;
// }
} else {
uni.showToast({
title: "请选择考核结果!",
icon: "none",
});
return;
}
if (!(this.imgsList && this.imgsList.length > 0)) {
uni.showToast({
title: "请上传现场照片!",
icon: "none",
});
return;
}
let extendObj = {
uploadResult: this.uploadResult,
imgsList: this.imgsList,
};
const req = {
templateId: this.detailObj.id,
userId: this.user.UserId,
userName: this.user.UserName,
extend: extendObj ? JSON.stringify(extendObj) : "",
completed: true,
placeId: 0,
placeName: this.detailObj.title,
provinceId: this.user.ProvinceCode,
provinceName: "",
serverPartId: this.detailObj.serverPartId,
serverPartName: this.detailObj.serverPartName,
questionResponses: this.selectAnwersList,
};
const data = await this.$request.$webNodePOST(
`questionnaire-responses`,
req
);
console.log("data", data);
if (data.code === 200) {
this.submit = true;
uni.showToast({
title: data.message,
icon: "none",
});
this.$util.toNextRoute(
"redirectTo",
`/pages/walkAroundManager/statusPage?id=${data.data.id}`
);
} else {
uni.showToast({
title: data.message,
icon: "error",
});
}
},
//
selectTag(item, detailItem) {
//
let have = false;
if (this.selectAnwersList && this.selectAnwersList.length > 0) {
let haveList = this.selectAnwersList.filter(
(item) => item.questionId === detailItem.id
);
if (haveList && haveList.length > 0) {
have = true;
}
}
// havetrue
if (have) {
//
let [type, questionType] = detailItem.type.split("_");
//
if (type === "radio") {
//
if (detailItem.options && detailItem.options.length > 0) {
detailItem.options.forEach((itemOption) => {
if (itemOption.text === item.text) {
itemOption.ischecked = true;
} else {
itemOption.ischecked = false;
}
});
}
//
let res = {
questionId: detailItem.id,
textResponse: "",
choiceResponse: [item.text],
imageResponse: "",
score: item.mark ? item.mark : 0,
};
this.selectAnwersObj[detailItem.id] = [item];
let newList = [];
if (this.selectAnwersList && this.selectAnwersList.length > 0) {
this.selectAnwersList.forEach((listItem) => {
if (listItem.questionId === detailItem.id) {
newList.push(res);
} else {
newList.push(listItem);
}
});
}
this.selectAnwersList = newList;
} else {
//
if (item.ischecked) {
//
let old = JSON.parse(
JSON.stringify(this.selectAnwersObj[detailItem.id])
);
let newList = [];
if (old && old.length > 0) {
old.forEach((olditem) => {
if (olditem.text === item.text) {
} else {
newList.push(olditem);
}
});
}
this.selectAnwersObj[detailItem.id] = newList;
let newselectAnwersList = [];
if (this.selectAnwersList && this.selectAnwersList.length > 0) {
this.selectAnwersList.forEach((listItem) => {
if (listItem.questionId === detailItem.id) {
let old = JSON.parse(JSON.stringify(listItem.choiceResponse));
let newList = [];
if (old && old.length > 0) {
old.forEach((olditem) => {
if (olditem === item.text) {
} else {
newList.push(olditem);
}
});
}
listItem.choiceResponse = newList;
if (newList && newList.length > 0) {
newselectAnwersList.push(listItem);
}
// listItem.choiceResponse.push(item.text);
}
});
}
this.selectAnwersList = newselectAnwersList;
item.ischecked = false;
} else {
item.ischecked = true;
let old = JSON.parse(
JSON.stringify(this.selectAnwersObj[detailItem.id])
);
old.push(item);
this.selectAnwersObj[detailItem.id] = old;
if (this.selectAnwersList && this.selectAnwersList.length > 0) {
this.selectAnwersList.forEach((listItem) => {
if (listItem.questionId === detailItem.id) {
listItem.choiceResponse.push(item.text);
}
});
}
}
}
} else {
// havefalse
let res = {
questionId: detailItem.id,
textResponse: "",
choiceResponse: [item.text],
imageResponse: "",
score: item.mark ? item.mark : 0,
};
this.selectAnwersObj[detailItem.id] = [item];
this.selectAnwersList.push(res);
item.ischecked = true;
}
this.$forceUpdate();
},
//
async handleGetModalData(id) {
const data = await this.$request.$webNodeGet(
`questionnaire-templates/${id}`
);
let obj = data.data;
console.log("obj", obj);
this.detailObj = obj;
let list = [];
if (
obj.questionnaireTemplateQuestions &&
obj.questionnaireTemplateQuestions.length > 0
) {
obj.questionnaireTemplateQuestions.forEach((item) => {
if (item.isRequired) {
list.push(item.questionId);
}
});
}
this.requiredList = list;
this.tagList = obj.questionnaireTemplateQuestions;
},
radioFocus() {
this.radiofocus = true;
this.imgfocus = false;
},
radioChange(evt) {
this.value = evt.target.value;
for (let i = 0; i < this.options.length; i++) {
if (this.options[i].value === evt.target.value) {
this.current = i;
break;
}
}
},
submitImg(e) {
this.imgfocus = true;
let _this = this;
uni.chooseImage({
count: 9, //9
sizeType: ["original", "compressed"],
sourceType: ["album", "camera"],
success: function (rs) {
console.log("rs", rs);
let quality = 100;
if (rs.tempFiles[0].size > 1024 * 200) {
quality = ((1024 * 200) / rs.tempFiles[0].size) * 100;
}
if (quality < 100 && rs.tempFiles[0].path.indexOf(".jpg") > -1) {
uni.compressImage({
src: rs.tempFilePaths[0], //
quality: quality, //
success(res) {
console.log("res", res);
let data = {};
if (res.data) {
data = JSON.parse(res.data);
}
console.log("data", data);
uni.showLoading({
title: "图片上传中...",
});
uni.uploadFile({
// url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=MBWA",
url: "https://es.robot-z.cn/oss/upload",
filePath: res.tempFilePath,
header: {
"Content-Type": "multipart/form-data",
},
formData: {},
fileType: "image",
name: "file",
success(res) {
console.log("res", res);
let data = {};
if (res.data) {
data = JSON.parse(res.data);
}
console.log("data", data);
uni.hideLoading();
_this.imgsList.push(
`https://es.robot-z.cn/${data.data.path}`
);
},
fail(error) {
console.log("error", error);
_this.noPost = true;
},
});
},
fail(error) {
_this.noPost = true;
},
});
} else {
uni.showLoading({
title: "图片上传中...",
// mask: true
});
uni.uploadFile({
// url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=MBWA",
url: "https://es.robot-z.cn/oss/upload",
filePath: rs.tempFilePaths[0],
fileType: "image",
header: {
"Content-Type": "multipart/form-data",
},
name: "file",
success(res) {
console.log("res", res);
let data = {};
if (res.data) {
data = JSON.parse(res.data);
}
console.log("data", data);
uni.hideLoading();
_this.imgsList.push(`https://es.robot-z.cn/${data.data.path}`);
// path;
},
fail(error) {
console.log("error", error);
_this.noPost = true;
},
});
}
// uni.uploadFile({
// url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=MBWA",
// filePath: imageSrc,
// fileType: "image",
// name: "data",
// success: (res) => {
// let _data = JSON.parse(res.data);
// uni.hideLoading();
// _this.imgsList.push(imageSrc);
// _this.imgData.push(_data.Data.IMAGE_PATH);
// },
// fail: (err) => {
// uni.showModal({
// content: err.errMsg,
// showCancel: false,
// });
// },
// });
},
fail: function (err) {},
});
},
},
};
</script>
<style lang="less" scoped>
.main {
width: 100%;
// height: 100vh;
background-color: #fff;
box-sizing: border-box;
padding-bottom: env(safe-area-inset-bottom); /* 兼容 iOS 11.2+ */
padding-bottom: constant(safe-area-inset-bottom);
.pageHeader {
height: 120rpx;
width: 100%;
background-color: rgb(246, 246, 246);
box-shadow: rgb(214, 207, 207) 4rpx 0px 20rpx;
background: url("../../static/images/mbwa/bj_logo.png") no-repeat bottom
right;
background-size: 34%;
padding-left: 30rpx;
box-sizing: border-box;
.hederContent {
display: flex;
align-items: center;
img {
width: 100rpx;
height: 100rpx;
border-radius: 50%;
margin-top: 10rpx;
margin-right: 20rpx;
}
}
}
.addressBox {
color: #727272;
padding: 30rpx;
.contentBox {
display: flex;
.addressIcon {
display: inline-block;
width: 49rpx;
height: 48rpx;
border-radius: 10rpx;
margin-right: 6rpx;
}
.xuncha {
font-size: 26rpx;
color: #1b1c20;
}
}
}
.formBox {
position: relative;
margin-left: 24rpx;
box-sizing: border-box;
ul {
li {
width: 100%;
position: relative;
margin-top: 16rpx;
.circle {
background-color: #b2b2b2;
height: 16rpx;
width: 16rpx;
border-radius: 50%;
position: absolute;
top: 16rpx;
left: 1rpx;
}
.circle-first {
top: 14rpx;
}
.circle-last {
top: 46rpx;
}
.circleActive {
height: 16rpx;
width: 16rpx;
border-radius: 50%;
position: absolute;
left: 1rpx;
background-color: #409eff;
}
.examineContent {
width: 100%;
box-sizing: border-box;
padding-left: 40rpx;
.titleBox {
display: flex;
align-items: center;
.img-zds {
display: inline-block;
width: 32rpx;
height: 32rpx;
background: url("../../static/images/mbwa/content_img_gray.png")
no-repeat center;
background-size: contain;
margin-right: 6rpx;
}
.img-upload {
display: inline-block;
width: 32rpx;
height: 32rpx;
background: url("../../static/images/mbwa/pic_img_gray.png")
no-repeat center;
background-size: contain;
margin-right: 6rpx;
}
.activezds {
background-image: url("../../static/images/mbwa/zdsgl_sm_nr.png");
}
.activeupload {
background-image: url("../../static/images/mbwa/zdsgl_sm_pic.png");
}
.titleText {
font-size: 26rpx;
color: #7a7a7a;
}
.titleTextActive {
font-size: 26rpx;
color: #409eff;
}
}
.inputBox {
color: #939393;
font-size: 24rpx;
padding-bottom: 40rpx;
width: 100%;
box-sizing: border-box;
textarea {
min-height: 50rpx;
font-size: 24rpx;
line-height: 1.8;
border-bottom: 1rpx solid #eee;
margin-top: 20rpx;
color: #727272;
}
}
.tagList {
display: flex;
font-size: 24rpx;
color: #606266;
width: 100%;
box-sizing: border-box;
.tagName {
width: 200rpx;
margin-right: 16rpx;
font-size: 22rpx;
line-height: 2.9;
}
.tagsBox {
width: calc(100% - 200rpx);
// width: 546rpx;
padding: 0 24rpx 0 12rpx;
}
.tagUnit {
padding: 4rpx 16rpx;
background-color: #f4f4f4;
color: #606266;
border-radius: 24rpx;
margin: 8rpx;
font-size: 22rpx;
display: inline-block;
vertical-align: middle;
}
.active {
color: #ed7043;
background-color: #fdf1ec;
}
}
.uploadBox {
display: flex;
flex-flow: row wrap;
justify-content: flex-start;
align-items: flex-start;
width: 100%;
box-sizing: border-box;
padding: 20rpx 0;
/* padding-left: 54rpx; */
min-height: 160rpx;
.uploadList {
position: relative;
display: flex;
flex-flow: row nowrap;
justify-content: center;
align-items: center;
background-color: #f1f1f1;
box-sizing: border-box;
width: 160rpx;
height: 160rpx;
border-radius: 6rpx;
margin-top: 16rpx;
}
.uploadList:nth-child(3n-1) {
margin-left: 16rpx;
margin-right: 16rpx;
}
.uploadList image {
width: 160rpx;
height: 160rpx;
border-radius: 6rpx;
}
.uploadAdd {
width: 26%;
box-sizing: border-box;
.upload-file-add-container {
display: flex;
flex-flow: column nowrap;
justify-content: center;
align-items: center;
border: 1rpx dashed #c6c6c6;
height: 160rpx;
width: 160rpx;
margin-top: 15rpx;
border-radius: 6rpx;
margin-left: 12rpx;
.walk-manage-plus {
line-height: 60rpx;
width: 62rpx;
height: 62rpx;
text-align: center;
border-radius: 50%;
background-color: #409eff;
color: #ffffff;
font-size: 48rpx;
box-shadow: 0 2rpx 6rpx 0 #eee;
}
}
}
}
.uni-list-cell {
justify-content: unset;
margin-top: 28rpx;
}
.uni-list-cell:after {
background-color: #f9f9f9;
}
}
}
.active .img-zds {
background-image: url("../../static/images/mbwa/zdsgl_sm_nr.png");
}
}
.btn {
width: 80%;
margin: 0 auto;
margin-top: 50rpx;
background-color: #409eff;
border-radius: 10rpx;
color: #fff;
font-size: 28rpx;
line-height: 2.8;
margin-top: 96rpx;
}
}
}
</style>

View File

@ -0,0 +1,85 @@
<template>
<view class="main">
<view class="content">
<image class="successImg" src="/static/images/submitSuccess.svg" />
<view class="btnBox">
<view class="detailBtn" @click="handleGoDetail">查看详情</view>
<view class="continue" @click="handleBackHome">继续考核</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
id: "",
};
},
onLoad(query) {
this.id = query.id;
},
methods: {
//
handleGoDetail() {
this.$util.toNextRoute(
"redirectTo",
`/pages/walkAroundManager/detail?id=${this.id}`
);
},
//
handleBackHome() {
this.$util.toNextRoute("switchTab", "/pages/index/index");
},
},
};
</script>
<style lang="less" scoped>
.main {
width: 100%;
height: 100vh;
background: #f6f7f8;
box-sizing: border-box;
padding: 32rpx;
.content {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
align-items: center;
box-sizing: border-box;
padding-top: 150rpx;
.successImg {
width: 500rpx;
height: 500rpx;
}
.btnBox {
.detailBtn {
font-family: "PingFangSC";
font-size: 32rpx;
color: #feffff;
line-height: 44rpx;
text-align: left;
font-style: normal;
padding: 12rpx 36rpx;
border-radius: 48rpx;
background: #7d5632;
margin-bottom: 24rpx;
}
.continue {
font-family: "PingFangSC";
font-size: 32rpx;
color: #7d5632;
line-height: 44rpx;
text-align: left;
font-style: normal;
padding: 8rpx 32rpx;
border-radius: 48rpx;
border: 4rpx solid #7d5632;
}
}
}
}
</style>

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.6 KiB

View File

@ -8,10 +8,10 @@ Vue.use(Vuex)
const state = {
visitChannels: '',
userData: {}, // 用户基础信息
toDoMsg: {},// 用户首页待办事项
isConnect: true ,// 网络是否链接
toDoMsg: {}, // 用户首页待办事项
isConnect: true, // 网络是否链接
isLoading: false, // 是否在请求数据
isChangeMsgCount: false ,// 是否更新待办事项
isChangeMsgCount: false, // 是否更新待办事项
shouldReLoadingList: false // 是否需要更新当前列表
};
@ -23,16 +23,16 @@ const getters = {
getMenu(state) {
return state.userData.AuthorityInfo
},
getConnect(state){
getConnect(state) {
return state.isConnect
},
getLoading (state) {
getLoading(state) {
return state.isLoading
},
isChangeMsgCount (state) {
isChangeMsgCount(state) {
return state.isChangeMsgCount
},
shouldReLoadingList (state) {
shouldReLoadingList(state) {
return state.shouldReLoadingList
},
@ -40,33 +40,40 @@ const getters = {
const mutations = {
setUser (state, data) {
setUser(state, data) {
state.userData = data
},
setVisitChannels (state, data) {
setVisitChannels(state, data) {
state.visitChannels = data
},
shouldReLoadingList (state, data){
shouldReLoadingList(state, data) {
state.shouldReLoadingList = data
},
isConnect(state,value) {
isConnect(state, value) {
state.isConnect = value
state.isConnect = value
},
setUserTodoList(state,value){
state.toDoMsg = value
setUserTodoList(state, value) {
state.toDoMsg = value
},
};
const actions = {
getLoginCode({ dispatch, state}, ){
getLoginCode({
dispatch,
state
}, ) {
uni.login({ // 登录
success (res) {
dispatch('memberLogin',res.code) // 获取用户数据
success(res) {
dispatch('memberLogin', res.code) // 获取用户数据
}
})
},
getTodoList({ dispatch, state,commit}){ // 获取用户待办事项
getTodoList({
dispatch,
state,
commit
}) { // 获取用户待办事项
let _user = state.userData
request.$get("ToDoList", {
userId: _user.UserId,
@ -75,34 +82,47 @@ const actions = {
commit('setUserTodoList', res.Data)
})
},
async memberLogin({ dispatch, state,commit},_code) {
async memberLogin({
dispatch,
state,
commit
}, _code) {
let _user = state.userData
request.$get('WeChat_Login',{
// request.$webGet('WebAPI_Push/WeChat/Login',{
request.$get('WeChat_Login', {
// request.$webGet('WebAPI_Push/WeChat/Login',{
WeChat_Code: _code || '',
}).then( async data=>{
console.log('memberLogin',data)
}).then(async data => {
console.log('memberLogin', data)
if (data.Result_Code === 100) {
let user = data.Result_Data
if (user.Membership_Id) {
let user = data.Result_Data
if (user.Membership_Id) {
wx.getPrivacySetting({
success: async res => {
console.log('res123123', res)
if (res.needAuthorization) {
util.toNextRoute('navigateTo', '/pages/register/register')
} else {
commit('setUser', user)
await dispatch('updateUser', data.Result_Data)
// _this.addUserBehavior(1002) // 记录用户行为
}
}
})
} else {
commit('setUser', user)
await dispatch('updateUser',data.Result_Data)
// _this.addUserBehavior(1002) // 记录用户行为
}else{
commit('setUser', user)
uni.showModal({
title:'温馨提示',
uni.showModal({
title: '温馨提示',
content: '请您授权登录后再操作。',
success(res) {
if(res.confirm){
if (res.confirm) {
util.toNextRoute('navigateTo', '/pages/register/register')
}
}
})
}
})
}
} else if (data.Result_Code === 200) { // session过期
dispatch('getLoginCode')
dispatch('getLoginCode')
} else {
console.log(data)
}
@ -110,17 +130,23 @@ const actions = {
})
},
async updateUser ({dispatch, commit, state},user){
async updateUser({
dispatch,
commit,
state
}, user) {
let _user = user || state.userData
let _id = _user.Membership_Id
console.log('_user',_user)
if(!_id) return
console.log('_user', _user)
if (!_id) return
// console.log(_user)
request.$get('WeChat_GetBusinessMemberInfo',{Membership_Id:_id}).then(res=>{
console.log('updateUser',res)
// request.$webGet('WebAPI_Push/Member/GetMemberInfo',{Membership_Id:_id,memberShipId:_id}).then(res=>{
if(res.Result_Code==100) {
request.$get('WeChat_GetBusinessMemberInfo', {
Membership_Id: _id
}).then(res => {
console.log('updateUser', res)
// request.$webGet('WebAPI_Push/Member/GetMemberInfo',{Membership_Id:_id,memberShipId:_id}).then(res=>{
if (res.Result_Code == 100) {
let data = res.Result_Data
data.WeChat_MiniProToken = _user.WeChat_MiniProToken
data.WeChat_UserId = _user.WeChat_UserId
@ -141,7 +167,7 @@ export default new Vuex.Store({
CreatePersistedState({
storage: {
getItem: key => uni.getStorageSync(key),
setItem: (key,value) => uni.setStorageSync(key,value),
setItem: (key, value) => uni.setStorageSync(key, value),
removeItem: key => uni.removeStorageSync(key)
}
})

View File

@ -19,7 +19,7 @@ export default {
* +-------------------
* @return {Promise} promise 返回promise供后续操作
*/
request: function(method, url, data, isWebApi) {
request: function (method, url, data, isWebApi) {
var promise = new Promise((resolve, reject) => {
//init
Store.state.isLoading = true
@ -31,29 +31,29 @@ export default {
data.WeChat_AppId = 'wxa99ef047735c031e'
data.WeChat_MiniProToken = Store.state.userData.WeChat_MiniProToken || ''
data.WeChatAppId = 'wxa99ef047735c031e'
data.memberShipId = !data.memberShipId ? (Store.state.userData.Membership_Id || '') :data.memberShipId // ||'3255' 1170386 1125717 //
data.memberShipId = !data.memberShipId ? (Store.state.userData.Membership_Id || '') : data.memberShipId // ||'3255' 1170386 1125717 //
// ModuleGuid:"60ee4604-0830-4056-931d-d1f7e111810c,1d46081b-6ff8-44d5-9205-31c72bdb4328",
let str = ''
if (Store.state.userData.AuthorityInfo){
if (Store.state.userData.AuthorityInfo['1d46081b-6ff8-44d5-9205-31c72bdb4328']===1){
str ='1d46081b-6ff8-44d5-9205-31c72bdb4328'
if (Store.state.userData.AuthorityInfo) {
if (Store.state.userData.AuthorityInfo['1d46081b-6ff8-44d5-9205-31c72bdb4328'] === 1) {
str = '1d46081b-6ff8-44d5-9205-31c72bdb4328'
}
if (Store.state.userData.AuthorityInfo['60ee4604-0830-4056-931d-d1f7e111810c']===1){
if (str===''){
if (Store.state.userData.AuthorityInfo['60ee4604-0830-4056-931d-d1f7e111810c'] === 1) {
if (str === '') {
str = '60ee4604-0830-4056-931d-d1f7e111810c'
}else{
str +=',60ee4604-0830-4056-931d-d1f7e111810c'
} else {
str += ',60ee4604-0830-4056-931d-d1f7e111810c'
}
}
if (Store.state.userData.AuthorityInfo['27109d64-63f9-4bb9-ab90-4c2c92296c73']===1){
if (str===''){
if (Store.state.userData.AuthorityInfo['27109d64-63f9-4bb9-ab90-4c2c92296c73'] === 1) {
if (str === '') {
str = '27109d64-63f9-4bb9-ab90-4c2c92296c73'
}else{
str +=',27109d64-63f9-4bb9-ab90-4c2c92296c73'
} else {
str += ',27109d64-63f9-4bb9-ab90-4c2c92296c73'
}
}
}
if (str===''){
if (str === '') {
str = 0
}
data.ModuleGuid = str
@ -64,14 +64,14 @@ export default {
}
let ModuleGuid = ''
let obj = Store.state.userData.AuthorityInfo
for (let key in obj){
for (let key in obj) {
// 经管 财务
if (key==='f0889950-f98a-40de-a369-613efeed2579' || key==='c021bbca-3c0a-478d-81e7-87e81ef80e05' ){
if (obj[key]===1){
if (ModuleGuid===''){
if (key === 'f0889950-f98a-40de-a369-613efeed2579' || key === 'c021bbca-3c0a-478d-81e7-87e81ef80e05') {
if (obj[key] === 1) {
if (ModuleGuid === '') {
ModuleGuid = key
}else{
ModuleGuid +=`,${key}`
} else {
ModuleGuid += `,${key}`
}
}
}
@ -79,28 +79,32 @@ export default {
if (method == 'POST' && !isWebApi) {
requstOptions.header = {
'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
'ServerpartCodes':Store.state.userData.UserCityAuthority,
'ServerpartCodes': Store.state.userData.UserCityAuthority,
'ProvinceCode': Store.state.userData.ProvinceCode,
'ModuleGuid':ModuleGuid,
'WeChat_AppId' : 'wxa99ef047735c031e',
'memberShipId' : !data.memberShipId ? (Store.state.userData.Membership_Id || '') :data.memberShipId,
'ModuleGuid': ModuleGuid,
'WeChat_AppId': 'wxa99ef047735c031e',
'memberShipId': !data.memberShipId ? (Store.state.userData.Membership_Id || '') : data.memberShipId,
'SourcePlatform': 'minProgram'
}
}else{
} else {
requstOptions.header = {
'ServerpartCodes':Store.state.userData.UserCityAuthority,
'ServerpartCodes': Store.state.userData.UserCityAuthority,
'ProvinceCode': Store.state.userData.ProvinceCode,
'ModuleGuid':ModuleGuid,
'WeChat_AppId' : 'wxa99ef047735c031e',
'memberShipId' : !data.memberShipId ? (Store.state.userData.Membership_Id || '') :data.memberShipId,
'ModuleGuid': ModuleGuid,
'WeChat_AppId': 'wxa99ef047735c031e',
'memberShipId': !data.memberShipId ? (Store.state.userData.Membership_Id || '') : data.memberShipId,
'SourcePlatform': 'minProgram'
}
}
requstOptions.success = (res) => {
console.log('resdadsadsa', res);
if (res.data.code === 200) {
resolve(res.data);
}
//服务器返回数据
if (res && (res.statusCode === 200 || res.statusCode === 304 || res.statusCode === 400)) {
else if (res && (res.statusCode === 200 || res.statusCode === 304 || res.statusCode === 400)) {
if (res.data && ((res.data.ResultCode != '999' && res.data.ResultCode != undefined) ||
(res.data.Result_Code != '999' && res.data.Result_Code != undefined))) {
(res.data.Result_Code != '999' && res.data.Result_Code != undefined))) {
resolve(res.data);
} else if (typeof res.data == 'object') { // 兼容招标投标模块
resolve(res.data);
@ -135,7 +139,7 @@ export default {
}
//网络请求
uni.request(requstOptions)
}).catch(function(reason, request) {
}).catch(function (reason, request) {
uni.showToast({
title: reason,

View File

@ -5,15 +5,16 @@ export default {
// baseURL: 'https://tcm.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx', // 合作商户请求
mpUrl: 'https://mp.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx', // 接口
apiurl: 'https://api.eshangtech.com/', // web api正式接口地址
// EshangUrl: 'https://eshangtech.com/',
// apiurl: 'https://erysfeipeng.oicp.net/', // web api
testApiurl: 'http://dev.eshangtech.com:8001/', // web api测试接口地址
apiurl: 'https://api.eshangtech.com/', // web api正式接口地址
// EshangUrl: 'https://eshangtech.com/',
// apiurl: 'https://erysfeipeng.oicp.net/', // web api
testApiurl: 'http://dev.eshangtech.com:8001/', // web api测试接口地址
NodeApiurl: 'https://es.robot-z.cn/', // web api测试接口地址
// NodeApiurl: 'http://home.robot-z.cn:7001/',
mobUrl: 'http://192.168.11.125:8000/Coop.Merchant/Handler/handler_ajax.ashx', // 接口
testURL1: 'http://192.168.10.123:8000', // 测试ip
testURL2: 'http://192.168.12.121:8010', // 测试ip
testApiName: '/MobileServicePlatform/Handler/handler_ajax.ashx', // 接口
}

View File

@ -4,10 +4,10 @@ import Store from '../store/store'
export default {
post: function (data) { // 合作商户请求
return Api.request('POST', ApiPath.baseURL ,data)
return Api.request('POST', ApiPath.baseURL, data)
},
get: function (data) { // 合作商户请求
return Api.request('GET', ApiPath.baseURL ,data)
get: function (data) { // 合作商户请求
return Api.request('GET', ApiPath.baseURL, data)
},
// postM: function (control,data) { // 移动业务请求
// data.action_type = control
@ -22,24 +22,33 @@ export default {
// data.action_type = control
// return Api.request('GET', ApiPath.mpUrl ,data)
// },
$get: function (controller,data) { // 合作商户请求
$get: function (controller, data) { // 合作商户请求
data.action_type = controller
return this.get(data)
},
$post: function (controller,data) { // 合作商户请求
$post: function (controller, data) { // 合作商户请求
data.action_type = controller
return this.post(data)
},
$webGet: function (controller,data) { // webapi
return Api.request('GET', ApiPath.apiurl +controller ,data||{},true)
$webGet: function (controller, data) { // webapi
return Api.request('GET', ApiPath.apiurl + controller, data || {}, true)
},
$webPost: function (controller,data) { // webapi
return Api.request('POST', ApiPath.apiurl +controller ,data||{},true)
$webPost: function (controller, data) { // webapi
return Api.request('POST', ApiPath.apiurl + controller, data || {}, true)
},
$webGetTest: function (controller,data) { // webapi
return Api.request('GET', ApiPath.testApiurl +controller ,data||{},true)
$webGetTest: function (controller, data) { // webapi
return Api.request('GET', ApiPath.testApiurl + controller, data || {}, true)
},
$webPostTest: function (controller,data) { // webapi
return Api.request('POST', ApiPath.testApiurl +controller ,data||{},true)
$webPostTest: function (controller, data) { // webapi
return Api.request('POST', ApiPath.testApiurl + controller, data || {}, true)
},
// 最新的测试
$webNodeGet: function (controller, data) {
return Api.request('GET', ApiPath.NodeApiurl + controller, data || {}, true)
},
$webNodePOST: function (controller, data) {
return Api.request('POST', ApiPath.NodeApiurl + controller, data || {}, true)
}
}