南网打包配置
This commit is contained in:
BianLzhaoMin
parent
ddb64815d9
commit
6f2a317f72
17
apis/http.js
17
apis/http.js
|
|
@ -18,29 +18,30 @@ class HttpConfig {
|
|||
// baseUrl = "https://z.csgmall.com.cn/gl"
|
||||
// baseUrl = "http://192.168.2.160:39080" // 梁超
|
||||
// baseUrl = "http://192.168.2.218:39080" // 福
|
||||
target = "http://192.168.0.119:21624"; // 开发阶段后台ip
|
||||
target = "http://192.168.2.74:49080"; // 开发阶段后台ip
|
||||
// #endif
|
||||
// 基地址 （部署时使用 需要加 dev-api）
|
||||
// authPath = `${this.baseUrl}/dev-api/auth`
|
||||
// systemPath = `${this.baseUrl}/dev-api/system`
|
||||
// basePath = `${this.baseUrl}/dev-api/base`
|
||||
// materialPath = `${this.baseUrl}/dev-api/material`
|
||||
baseUrl = ENV === "production" ? "http://192.168.0.56:21627" : this.target;
|
||||
authPath =
|
||||
baseUrl =
|
||||
ENV === "production"
|
||||
? `${this.baseUrl}/dev-api/auth`
|
||||
: `${this.baseUrl}/auth`;
|
||||
? "https://test-cc.zhgkxt.com/sgzbgl-api"
|
||||
: this.target;
|
||||
authPath =
|
||||
ENV === "production" ? `${this.baseUrl}/auth` : `${this.baseUrl}/auth`;
|
||||
systemPath =
|
||||
ENV === "production"
|
||||
? `${this.baseUrl}/dev-api/system`
|
||||
? `${this.baseUrl}/system`
|
||||
: `${this.baseUrl}/system`;
|
||||
basePath =
|
||||
ENV === "production"
|
||||
? `${this.baseUrl}/dev-api/material/base`
|
||||
? `${this.baseUrl}/material/base`
|
||||
: `${this.baseUrl}/material/base`;
|
||||
materialPath =
|
||||
ENV === "production"
|
||||
? `${this.baseUrl}/dev-api/material`
|
||||
? `${this.baseUrl}/material`
|
||||
: `${this.baseUrl}/material`;
|
||||
// 短链
|
||||
serviceUrl = {
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ class Http {
|
|||
title: "登录状态过期，请重新登录！",
|
||||
success: () => {
|
||||
uni.reLaunch({
|
||||
url: "/pages/login/login",
|
||||
// url: "/pages/nwLogin/index",
|
||||
// url: "/pages/login/login",
|
||||
url: "/pages/nwLogin/index",
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
@ -56,8 +56,8 @@ class Http {
|
|||
title: "登录状态过期，请重新登录！",
|
||||
success: () => {
|
||||
uni.reLaunch({
|
||||
url: "/pages/login/login",
|
||||
// url: "/pages/nwLogin/index",
|
||||
// url: "/pages/login/login",
|
||||
url: "/pages/nwLogin/index",
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
@ -93,8 +93,8 @@ class Http {
|
|||
title: "登录状态过期，请重新登录！",
|
||||
success: () => {
|
||||
uni.reLaunch({
|
||||
url: "/pages/login/login",
|
||||
// url: "/pages/nwLogin/index",
|
||||
// url: "/pages/login/login",
|
||||
url: "/pages/nwLogin/index",
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
@ -129,8 +129,8 @@ class Http {
|
|||
title: "登录状态过期，请重新登录！",
|
||||
success: () => {
|
||||
uni.reLaunch({
|
||||
url: "/pages/login/login",
|
||||
// url: "/pages/nwLogin/index",
|
||||
// url: "/pages/login/login",
|
||||
url: "/pages/nwLogin/index",
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
@ -163,8 +163,8 @@ class Http {
|
|||
title: "登录状态过期，请重新登录！",
|
||||
success: () => {
|
||||
uni.reLaunch({
|
||||
url: "/pages/login/login",
|
||||
// url: "/pages/nwLogin/index",
|
||||
// url: "/pages/login/login",
|
||||
url: "/pages/nwLogin/index",
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -43,7 +43,14 @@
|
|||
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
|
||||
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
|
||||
"<uses-feature android:name=\"android.hardware.camera\"/>",
|
||||
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
|
||||
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
|
||||
"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\" />",
|
||||
"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\" />",
|
||||
"<uses-permission android:name=\"android.permission.READ_LOGS\\\" />",
|
||||
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\\\" />",
|
||||
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\\\" />",
|
||||
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\\\" />"
|
||||
]
|
||||
},
|
||||
/* ios打包配置 */
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
{
|
||||
"path": "pages/nwLogin/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "南网登录"
|
||||
"navigationBarTitleText": "登录"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,15 +3,18 @@
|
|||
<view
|
||||
class="single-fetch"
|
||||
v-for="(fetch, index) in fetchMaterialList"
|
||||
:key="index"
|
||||
>
|
||||
:key="index">
|
||||
<view class="fetch-upper">
|
||||
<view class="upper-lef">
|
||||
{{ fetch.backPerson == null ? '' : fetch.backPerson.slice(0, 1) }}
|
||||
{{
|
||||
fetch.backPerson == null
|
||||
? ""
|
||||
: fetch.backPerson.slice(0, 1)
|
||||
}}
|
||||
</view>
|
||||
<view class="upper-rig">
|
||||
<h4 style="font-size: 16px;">{{ fetch.backPerson }}</h4>
|
||||
<h4 style="color: #989898;">{{ fetch.phone }}</h4>
|
||||
<h4 style="font-size: 16px">{{ fetch.backPerson }}</h4>
|
||||
<h4 style="color: #989898">{{ fetch.phone }}</h4>
|
||||
</view>
|
||||
</view>
|
||||
<view class="fetch-lower">
|
||||
|
|
@ -42,18 +45,20 @@
|
|||
</view>
|
||||
<view class="fetch-btns">
|
||||
<view
|
||||
style="background-color: #3788FF;"
|
||||
@click="seeDetail(fetch.id)"
|
||||
>
|
||||
<uni-icons style="color: #fff;" type="eye"></uni-icons>
|
||||
style="background-color: #3788ff"
|
||||
@click="seeDetail(fetch.id)">
|
||||
<uni-icons style="color: #fff" type="eye"></uni-icons>
|
||||
查看
|
||||
</view>
|
||||
<view
|
||||
style="background-color: #FCA30D;"
|
||||
v-show="fetch.taskStatus == 37 && roles.includes('jjfgs') && fetch.status == 0"
|
||||
@click="toggleOpenModal(fetch)"
|
||||
>
|
||||
<uni-icons style="color: #fff;" type="auth"></uni-icons>
|
||||
style="background-color: #fca30d"
|
||||
v-show="
|
||||
fetch.taskStatus == 37 &&
|
||||
roles.includes('jjfgs') &&
|
||||
fetch.status == 0
|
||||
"
|
||||
@click="toggleOpenModal(fetch)">
|
||||
<uni-icons style="color: #fff" type="auth"></uni-icons>
|
||||
机具审核
|
||||
</view>
|
||||
<!-- <view
|
||||
|
|
@ -69,31 +74,17 @@
|
|||
<!-- <image src="/static/passed.png" v-show="Number(fetch.taskStatus) >= '38'" mode=""></image>
|
||||
<image src="/static/noPass.png" v-show="fetch.status == '1'" mode=""></image>
|
||||
<image src="/static/noExam.png" v-show="Number(fetch.taskStatus) < '38'" mode=""></image> -->
|
||||
<h4
|
||||
v-show="fetch.taskStatus == '37'"
|
||||
>
|
||||
退料待审核
|
||||
</h4>
|
||||
<h4
|
||||
v-show="fetch.taskStatus == '38'"
|
||||
>
|
||||
退料已审核
|
||||
</h4>
|
||||
<h4
|
||||
v-show="fetch.taskStatus == '39'"
|
||||
>
|
||||
退料核查中
|
||||
</h4>
|
||||
<h4 v-show="fetch.taskStatus == '37'">退料待审核</h4>
|
||||
<h4 v-show="fetch.taskStatus == '38'">退料已审核</h4>
|
||||
<h4 v-show="fetch.taskStatus == '39'">退料核查中</h4>
|
||||
<h4
|
||||
v-show="fetch.taskStatus == '101'"
|
||||
style="border: 1px solid #EE603D; color: #EE603D;"
|
||||
>
|
||||
style="border: 1px solid #ee603d; color: #ee603d">
|
||||
退料审核驳回
|
||||
</h4>
|
||||
<h4
|
||||
v-show="fetch.taskStatus == '40'"
|
||||
style="border: 1px solid #27D870; color: #27D870;"
|
||||
>
|
||||
style="border: 1px solid #27d870; color: #27d870">
|
||||
退料完成
|
||||
</h4>
|
||||
</view>
|
||||
|
|
@ -112,45 +103,46 @@
|
|||
审核
|
||||
</view>
|
||||
</view> -->
|
||||
<uni-popup
|
||||
ref="popup"
|
||||
type="center"
|
||||
:mask-click="false"
|
||||
>
|
||||
<uni-popup ref="popup" type="center" :mask-click="false">
|
||||
<view class="popup">
|
||||
<view class="pop-top">
|
||||
<h4>审批</h4>
|
||||
<uni-icons
|
||||
style="color: #AAAAAA; font-weight: bold;"
|
||||
style="color: #aaaaaa; font-weight: bold"
|
||||
type="closeempty"
|
||||
@click="closePopup"
|
||||
>
|
||||
@click="closePopup">
|
||||
</uni-icons>
|
||||
</view>
|
||||
<h4 style="width: 85%; margin: 2vh auto; font-weight: normal; text-align: center;">是否通过审批？</h4>
|
||||
<h4
|
||||
style="
|
||||
width: 85%;
|
||||
margin: 2vh auto;
|
||||
font-weight: normal;
|
||||
text-align: center;
|
||||
">
|
||||
是否通过审批？
|
||||
</h4>
|
||||
<view class="select-area">
|
||||
<view @click="modalConfirm">通过</view>
|
||||
<view @click="modalReject">驳回</view>
|
||||
</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
<uni-popup
|
||||
ref="popup1"
|
||||
type="center"
|
||||
:mask-click="false"
|
||||
>
|
||||
<uni-popup ref="popup1" type="center" :mask-click="false">
|
||||
<view class="popup1">
|
||||
<view class="pop-top">
|
||||
<h4>驳回原因</h4>
|
||||
<uni-icons
|
||||
style="color: #AAAAAA; font-weight: bold;"
|
||||
style="color: #aaaaaa; font-weight: bold"
|
||||
type="closeempty"
|
||||
@click="closePopup1"
|
||||
>
|
||||
@click="closePopup1">
|
||||
</uni-icons>
|
||||
</view>
|
||||
<view class="select-area">
|
||||
<uni-easyinput v-model="rejectReason" maxlength="50" placeholder="请填写驳回原因"></uni-easyinput>
|
||||
<uni-easyinput
|
||||
v-model="rejectReason"
|
||||
maxlength="50"
|
||||
placeholder="请填写驳回原因"></uni-easyinput>
|
||||
<view class="btn" @click="confirmReject">驳回</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -159,230 +151,244 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { basePath } from '../../public'
|
||||
import { basePath } from "../../public";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
allChecked: false,
|
||||
examFormData: {
|
||||
ifPass: '',
|
||||
noPassReason: ''
|
||||
ifPass: "",
|
||||
noPassReason: "",
|
||||
},
|
||||
ifPassRange: [
|
||||
{ text: '是', value: '0' },
|
||||
{ text: '否', value: '1' }
|
||||
{ text: "是", value: "0" },
|
||||
{ text: "否", value: "1" },
|
||||
],
|
||||
rules: {
|
||||
ifPass: {
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
errorMessage: '请选择是否通过！'
|
||||
}
|
||||
]
|
||||
}
|
||||
errorMessage: "请选择是否通过！",
|
||||
},
|
||||
fetchMaterialList: [
|
||||
|
||||
],
|
||||
},
|
||||
},
|
||||
fetchMaterialList: [],
|
||||
examList: [],
|
||||
deviceList: [],
|
||||
roles: uni.getStorageSync('roles'),
|
||||
roles: uni.getStorageSync("roles"),
|
||||
modalList: {},
|
||||
rejectReason: ''
|
||||
}
|
||||
rejectReason: "",
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
seeDetail (id) {
|
||||
seeDetail(id) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/exitExamDetail/exitExamDetail?id=${id}`
|
||||
})
|
||||
url: `/pages/exitExamDetail/exitExamDetail?id=${id}`,
|
||||
});
|
||||
},
|
||||
checkAll() {
|
||||
this.allChecked = !this.allChecked
|
||||
this.allChecked = !this.allChecked;
|
||||
if (this.allChecked) {
|
||||
this.fetchMaterialList.map(item => {
|
||||
this.fetchMaterialList.map((item) => {
|
||||
if (item.checked == false) {
|
||||
item.checked = true
|
||||
item.checked = true;
|
||||
}
|
||||
})
|
||||
});
|
||||
} else {
|
||||
this.fetchMaterialList.map(item => {
|
||||
this.fetchMaterialList.map((item) => {
|
||||
if (item.checked == true) {
|
||||
item.checked = false
|
||||
item.checked = false;
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
},
|
||||
checkClick(item) {
|
||||
item.checked = !item.checked
|
||||
item.checked = !item.checked;
|
||||
if (!item.checked) {
|
||||
this.allChecked = false
|
||||
this.allChecked = false;
|
||||
} else {
|
||||
const goods = this.fetchMaterialList.every(item => {
|
||||
return item.checked === true
|
||||
})
|
||||
const goods = this.fetchMaterialList.every((item) => {
|
||||
return item.checked === true;
|
||||
});
|
||||
if (goods) {
|
||||
this.allChecked = true
|
||||
this.allChecked = true;
|
||||
} else {
|
||||
this.allChecked = false
|
||||
this.allChecked = false;
|
||||
}
|
||||
}
|
||||
},
|
||||
toggleOpenModal (info) {
|
||||
toggleOpenModal(info) {
|
||||
console.log(info);
|
||||
this.modalList = info
|
||||
this.$refs.popup.open()
|
||||
this.modalList = info;
|
||||
this.$refs.popup.open();
|
||||
},
|
||||
modalConfirm () {
|
||||
let that = this
|
||||
modalConfirm() {
|
||||
let that = this;
|
||||
console.log(that.modalList);
|
||||
that.seeExam(that.modalList.id)
|
||||
that.seeExam(that.modalList.id);
|
||||
},
|
||||
modalReject () {
|
||||
let that = this
|
||||
modalReject() {
|
||||
let that = this;
|
||||
console.log(that.modalList);
|
||||
that.rejectExam(that.modalList.id)
|
||||
that.rejectExam(that.modalList.id);
|
||||
// that.$refs.popup1.open()
|
||||
},
|
||||
confirmReject () {
|
||||
let that = this
|
||||
if (that.rejectReason == '') {
|
||||
confirmReject() {
|
||||
let that = this;
|
||||
if (that.rejectReason == "") {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '请填写驳回原因！'
|
||||
})
|
||||
icon: "none",
|
||||
title: "请填写驳回原因！",
|
||||
});
|
||||
} else {
|
||||
that.modalList.directAuditRemark = that.rejectReason
|
||||
that.modalList.directAuditRemark = that.rejectReason;
|
||||
console.log(that.modalList);
|
||||
that.rejectExam(that.modalList.id, that.modalList.directAuditRemark)
|
||||
that.rejectExam(
|
||||
that.modalList.id,
|
||||
that.modalList.directAuditRemark
|
||||
);
|
||||
}
|
||||
},
|
||||
closePopup () {
|
||||
this.$refs.popup.close()
|
||||
closePopup() {
|
||||
this.$refs.popup.close();
|
||||
},
|
||||
closePopup1 () {
|
||||
this.$refs.popup1.close()
|
||||
closePopup1() {
|
||||
this.$refs.popup1.close();
|
||||
},
|
||||
seeExam (id) {
|
||||
let that = this
|
||||
seeExam(id) {
|
||||
let that = this;
|
||||
// 提交单个审核
|
||||
that.$api.exitExam.subExitExam({
|
||||
id
|
||||
that.$api.exitExam
|
||||
.subExitExam({
|
||||
id,
|
||||
// directAuditRemark
|
||||
}).then(res => {
|
||||
})
|
||||
.then((res) => {
|
||||
console.log(res);
|
||||
if (res.data.code == 200) {
|
||||
that.closePopup()
|
||||
that.closePopup1()
|
||||
that.closePopup();
|
||||
that.closePopup1();
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
icon: "none",
|
||||
title: res.data.msg,
|
||||
success: () => {
|
||||
uni.redirectTo({
|
||||
url: '/pages/exitExam/exitExam'
|
||||
})
|
||||
}
|
||||
})
|
||||
} else {
|
||||
that.closePopup()
|
||||
that.closePopup1()
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: res.data.msg
|
||||
})
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
})
|
||||
url: "/pages/exitExam/exitExam",
|
||||
});
|
||||
},
|
||||
rejectExam (id) {
|
||||
let that = this
|
||||
});
|
||||
} else {
|
||||
that.closePopup();
|
||||
that.closePopup1();
|
||||
uni.showToast({
|
||||
icon: "none",
|
||||
title: res.data.msg,
|
||||
});
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
},
|
||||
rejectExam(id) {
|
||||
let that = this;
|
||||
// 拒绝单个审核
|
||||
that.$api.exitExam.rejectExitExam({
|
||||
id
|
||||
that.$api.exitExam
|
||||
.rejectExitExam({
|
||||
id,
|
||||
// directAuditRemark
|
||||
}).then(res => {
|
||||
})
|
||||
.then((res) => {
|
||||
console.log(res);
|
||||
if (res.data.code == 200) {
|
||||
that.closePopup()
|
||||
that.closePopup1()
|
||||
that.closePopup();
|
||||
that.closePopup1();
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
icon: "none",
|
||||
title: res.data.msg,
|
||||
success: () => {
|
||||
uni.redirectTo({
|
||||
url: '/pages/exitExam/exitExam'
|
||||
})
|
||||
}
|
||||
})
|
||||
url: "/pages/exitExam/exitExam",
|
||||
});
|
||||
},
|
||||
});
|
||||
} else {
|
||||
that.closePopup()
|
||||
that.closePopup1()
|
||||
that.closePopup();
|
||||
that.closePopup1();
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: res.data.msg
|
||||
})
|
||||
icon: "none",
|
||||
title: res.data.msg,
|
||||
});
|
||||
}
|
||||
}).catch(err => {
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
})
|
||||
}
|
||||
});
|
||||
},
|
||||
},
|
||||
onShow() {
|
||||
let that = this
|
||||
let that = this;
|
||||
// that.roles = uni.getStorageSync('roles')
|
||||
console.log(that.roles, uni.getStorageSync('userInfo').sysUser.companyId);
|
||||
if (that.roles.includes('admin')) that.roles = ['admin', 'jjfgs', 'tsfgs']
|
||||
console.log(
|
||||
that.roles,
|
||||
uni.getStorageSync("userInfo").sysUser.companyId
|
||||
);
|
||||
if (that.roles.includes("admin"))
|
||||
that.roles = ["admin", "jjfgs", "tsfgs"];
|
||||
// 获取退料审批清单
|
||||
that.$api.exitExam.exitExamList({
|
||||
companyId: uni.getStorageSync('userInfo').sysUser.companyId
|
||||
that.$api.exitExam
|
||||
.exitExamList({
|
||||
companyId: uni.getStorageSync("userInfo").sysUser.companyId,
|
||||
// companyId: 1
|
||||
}).then(res => {
|
||||
})
|
||||
.then((res) => {
|
||||
console.log(res);
|
||||
if (res.data.code == 200) {
|
||||
if (res.data.data.length == 0) {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '未查询到相关数据！'
|
||||
})
|
||||
icon: "none",
|
||||
title: "未查询到相关数据！",
|
||||
});
|
||||
} else {
|
||||
that.fetchMaterialList = res.data.data
|
||||
that.fetchMaterialList = res.data.data;
|
||||
console.log(that.fetchMaterialList);
|
||||
}
|
||||
} else if (res.data.code == 500) {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '登录状态已过期，请重新登录！',
|
||||
icon: "none",
|
||||
title: "登录状态已过期，请重新登录！",
|
||||
success: () => {
|
||||
uni.removeStorageSync('token')
|
||||
uni.removeStorageSync('userInfo')
|
||||
uni.removeStorageSync("token");
|
||||
uni.removeStorageSync("userInfo");
|
||||
uni.reLaunch({
|
||||
url: '/pages/login/login'
|
||||
// url: '/pages/nwLogin/index'
|
||||
})
|
||||
}
|
||||
})
|
||||
// url: '/pages/login/login'
|
||||
url: "/pages/nwLogin/index",
|
||||
});
|
||||
},
|
||||
});
|
||||
} else {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: res.data.msg
|
||||
})
|
||||
icon: "none",
|
||||
title: res.data.msg,
|
||||
});
|
||||
}
|
||||
}).catch(err => {
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
})
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
body{
|
||||
body {
|
||||
background-color: #f8f8f8;
|
||||
box-sizing: border-box;
|
||||
padding-bottom: 10vh;
|
||||
}
|
||||
.single-fetch{
|
||||
.single-fetch {
|
||||
width: 95%;
|
||||
margin: 20rpx auto;
|
||||
background-color: #fff;
|
||||
|
|
@ -390,69 +396,69 @@ import { basePath } from '../../public'
|
|||
box-sizing: border-box;
|
||||
padding: 15rpx;
|
||||
position: relative;
|
||||
.fetch-upper{
|
||||
.fetch-upper {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 15rpx;
|
||||
border-bottom: 1px solid #D7D7D7;
|
||||
border-bottom: 1px solid #d7d7d7;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
.upper-lef{
|
||||
.upper-lef {
|
||||
width: 12%;
|
||||
height: 5vh;
|
||||
border-radius: 15rpx;
|
||||
background-color: #378AFF;
|
||||
background-color: #378aff;
|
||||
color: #fff;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 24px;
|
||||
}
|
||||
.upper-rig{
|
||||
.upper-rig {
|
||||
flex: 1;
|
||||
box-sizing: border-box;
|
||||
padding: 10rpx 20rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
h4{
|
||||
h4 {
|
||||
font-weight: normal;
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.fetch-lower{
|
||||
.fetch-lower {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 15rpx;
|
||||
border-bottom: 1px solid #D7D7D7;
|
||||
view{
|
||||
border-bottom: 1px solid #d7d7d7;
|
||||
view {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 15rpx;
|
||||
font-size: 14px;
|
||||
span{
|
||||
color: #9D9D9D;
|
||||
span {
|
||||
color: #9d9d9d;
|
||||
padding-right: 20rpx;
|
||||
}
|
||||
h4{
|
||||
h4 {
|
||||
color: #000;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
}
|
||||
}
|
||||
view:last-child{
|
||||
view:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
.fetch-btns{
|
||||
.fetch-btns {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 15rpx;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
view{
|
||||
view {
|
||||
box-sizing: border-box;
|
||||
padding: 8rpx 25rpx;
|
||||
border-radius: 15rpx;
|
||||
|
|
@ -460,27 +466,27 @@ import { basePath } from '../../public'
|
|||
margin-right: 15rpx;
|
||||
font-size: 14px;
|
||||
}
|
||||
view:last-child{
|
||||
view:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
.sticky-area{
|
||||
.sticky-area {
|
||||
position: absolute;
|
||||
top: 20rpx;
|
||||
right: 20rpx;
|
||||
h4{
|
||||
h4 {
|
||||
box-sizing: border-box;
|
||||
padding: 8rpx 20rpx;
|
||||
border-radius: 15rpx;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
background-color: #fff;
|
||||
border: 1px solid #3788FF;
|
||||
color: #3788FF;
|
||||
border: 1px solid #3788ff;
|
||||
color: #3788ff;
|
||||
}
|
||||
}
|
||||
}
|
||||
.btm-sticky{
|
||||
.btm-sticky {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
|
|
@ -491,27 +497,27 @@ import { basePath } from '../../public'
|
|||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
.checked{
|
||||
.checked {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.exam{
|
||||
.exam {
|
||||
box-sizing: border-box;
|
||||
padding: 10rpx 50rpx;
|
||||
border-radius: 30rpx;
|
||||
background-color: #3788FF;
|
||||
background-color: #3788ff;
|
||||
font-size: 14px;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
.popup{
|
||||
.popup {
|
||||
width: 80vw;
|
||||
height: 20vh;
|
||||
background-color: #fff;
|
||||
border-radius: 15rpx;
|
||||
overflow: hidden;
|
||||
background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
|
||||
.pop-top{
|
||||
background: linear-gradient(#d9e7fe, #fff, #fff, #fff);
|
||||
.pop-top {
|
||||
width: 100%;
|
||||
height: 5vh;
|
||||
box-sizing: border-box;
|
||||
|
|
@ -520,30 +526,30 @@ import { basePath } from '../../public'
|
|||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
.select-area{
|
||||
.select-area {
|
||||
width: 85%;
|
||||
margin: 40rpx auto;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
align-items: center;
|
||||
view{
|
||||
view {
|
||||
box-sizing: border-box;
|
||||
font-size: 30rpx;
|
||||
padding: 12rpx 24rpx;
|
||||
background-color: #3788FF;
|
||||
background-color: #3788ff;
|
||||
color: #fff;
|
||||
border-radius: 20rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
.popup1{
|
||||
.popup1 {
|
||||
width: 80vw;
|
||||
height: 20vh;
|
||||
background-color: #fff;
|
||||
border-radius: 15rpx;
|
||||
overflow: hidden;
|
||||
background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
|
||||
.pop-top{
|
||||
background: linear-gradient(#d9e7fe, #fff, #fff, #fff);
|
||||
.pop-top {
|
||||
width: 100%;
|
||||
height: 5vh;
|
||||
box-sizing: border-box;
|
||||
|
|
@ -552,17 +558,17 @@ import { basePath } from '../../public'
|
|||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
.select-area{
|
||||
.select-area {
|
||||
width: 85%;
|
||||
margin: 40rpx auto;
|
||||
.btn{
|
||||
.btn {
|
||||
width: 30%;
|
||||
box-sizing: border-box;
|
||||
padding: 10rpx 0;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background-color: #3788FF;
|
||||
background-color: #3788ff;
|
||||
color: #fff;
|
||||
font-size: 14px;
|
||||
border-radius: 15rpx;
|
||||
|
|
|
|||
|
|
@ -434,8 +434,8 @@
|
|||
uni.removeStorageSync("token");
|
||||
uni.removeStorageSync("userInfo");
|
||||
uni.reLaunch({
|
||||
url: "/pages/login/login",
|
||||
// url: "/pages/nwLogin/index",
|
||||
// url: "/pages/login/login",
|
||||
url: "/pages/nwLogin/index",
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -644,8 +644,8 @@
|
|||
uni.removeStorageSync("token");
|
||||
uni.removeStorageSync("userInfo");
|
||||
uni.reLaunch({
|
||||
url: "/pages/login/login",
|
||||
// url: "/pages/nwLogin/index",
|
||||
// url: "/pages/login/login",
|
||||
url: "/pages/nwLogin/index",
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -273,12 +273,12 @@
|
|||
success: () => {
|
||||
uni.removeStorageSync("token");
|
||||
uni.removeStorageSync("userInfo");
|
||||
uni.reLaunch({
|
||||
url: "/pages/login/login",
|
||||
});
|
||||
// uni.reLaunch({
|
||||
// url: "/pages/nwLogin/index",
|
||||
// url: "/pages/login/login",
|
||||
// });
|
||||
uni.reLaunch({
|
||||
url: "/pages/nwLogin/index",
|
||||
});
|
||||
},
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -220,6 +220,8 @@
|
|||
const { data: messageRes } =
|
||||
await this.$api.login.getMessageCode(params);
|
||||
|
||||
console.log("-----", messageRes, "-----");
|
||||
|
||||
if (messageRes.code === 200) {
|
||||
uni.showToast({
|
||||
icon: "none",
|
||||
|
|
@ -456,7 +458,7 @@
|
|||
? "测试环境或者线上ip"
|
||||
: "本地调试ip";
|
||||
uni.request({
|
||||
url: "http://192.168.0.119:21624/sgzbgl-api/code",
|
||||
url: "http://192.168.2.74:49080/code",
|
||||
method: "GET",
|
||||
}).then((res) => {
|
||||
this.phoneCodeUrlNew =
|
||||
|
|
|
|||
|
|
@ -72,8 +72,8 @@
|
|||
uni.removeStorageSync("token");
|
||||
uni.removeStorageSync("userInfo");
|
||||
uni.reLaunch({
|
||||
url: "/pages/login/login",
|
||||
// url: "/pages/nwLogin/index",
|
||||
// url: "/pages/login/login",
|
||||
url: "/pages/nwLogin/index",
|
||||
});
|
||||
}
|
||||
},
|
||||
|
|
|
|||
14
router.js
14
router.js
|
|
@ -25,16 +25,16 @@ const router = createRouter({
|
|||
},
|
||||
},
|
||||
// 重庆登录页
|
||||
{
|
||||
path: "/pages/login/login",
|
||||
name: "login",
|
||||
},
|
||||
|
||||
// 南网登陆页
|
||||
// {
|
||||
// path: "/pages/nwLogin/index",
|
||||
// path: "/pages/login/login",
|
||||
// name: "login",
|
||||
// },
|
||||
|
||||
// 南网登陆页
|
||||
{
|
||||
path: "/pages/nwLogin/index",
|
||||
name: "login",
|
||||
},
|
||||
{
|
||||
path: "/pages/fetchMaterial/fetchMaterial",
|
||||
name: "fetchMaterial",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
-keep class com.dcloud.** { *; }
|
||||
-keep public class * extends io.dcloud.* {
|
||||
*;
|
||||
}
|
||||
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
https://app.liuyingyong.cn/build/download/ace9e090-602c-11ef-a76c-b5b4f2c19209
|
||||
https://app.liuyingyong.cn/build/download/0c114b20-7d8f-11ef-8759-952981b5c6a0
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue