This commit is contained in:
qijq 2025-05-08 16:30:21 +08:00
parent 84a0ca159c
commit c50b55044a
9 changed files with 2414 additions and 200 deletions

View File

@ -14,14 +14,11 @@ export default {
// #ifdef APP-PLUS
getCurrentNo((res) => {
this.version = res.version;
console.log("asdas", res);
});
this.onAPPUpdate();
// #endif
},
onShow: function () {
this.getAPPversion();
},
onShow: function () {},
onHide: function () {},
onBackPress: function () {},
methods: {

View File

@ -15,7 +15,7 @@
{
"path": "pages/audit/shop1",
"style": {
"navigationBarTitleText": "填写店铺信息第1步/共3步"
"navigationStyle": "custom"
}
},
{

View File

@ -1,5 +1,14 @@
<template>
<view class="shop-1-container">
<u-navbar
:autoBack="true"
:safeAreaInsetTop="true"
title="填写店铺信息第1步/共3步"
>
<template slot="right">
<view class="btn-register" @click="LoginOut">退出登录</view>
</template>
</u-navbar>
<!-- <u-loading-page
:loading="showLodingPage"
font-size="18"
@ -105,6 +114,7 @@
</template>
<script>
import { UploadFilePromise } from "../../api/upload";
import { mapActions } from "vuex";
export default {
data() {
return {
@ -183,6 +193,7 @@ export default {
this.$refs["uForm"].setRules(this.rules);
},
methods: {
...mapActions("user", ["LoginOut"]),
async afterRead1(e) {
const item = e.file;
const imgUrl = item.url;

View File

@ -139,7 +139,7 @@
<script>
import { mapActions, mapState } from "vuex";
import { GetVerifyCode } from "@/api/login";
import { GetVerifyCode, GetSmsCode } from "@/api/login";
export default {
name: "login",
data() {
@ -195,7 +195,7 @@ export default {
},
onHide() {},
methods: {
...mapActions("user", ["GetLogin", "GetSmsCode", "GetAccountLogin"]),
...mapActions("user", ["GetLogin", "GetAccountLogin"]),
loadSmsTime() {
this.time = setInterval(() => {
this.verifyText--;
@ -359,7 +359,7 @@ export default {
}
}, 1000);
await this.getSmsCode(params);
await GetSmsCode(params);
},
async getVerifyCode() {
this.verify_token = new Date().getTime();

View File

@ -1,4 +1,3 @@
import { GetLogin, GetSmsCode, GetAccountLogin } from '../../api/login';
import { GetAuditStatus } from '../../api/audit';
// import $cookies from '../../utils/vue-cookies'
@ -6,7 +5,7 @@ import { GetAuditStatus } from '../../api/audit';
const defaultState = () => {
return {
userInfo: uni.getStorageSync('userInfo') || {
user_mobile:''
user_mobile: '',
},
uid: uni.getStorageSync('uid') || '',
ukey: uni.getStorageSync('ukey') || '',
@ -14,44 +13,38 @@ const defaultState = () =>{
approval_invalid_col: [],
approval_status: -4,
approval_remark: '',
id:0
id: 0,
},
approvalStatus:uni.getStorageSync('approvalStatus')
}
}
approvalStatus: uni.getStorageSync('approvalStatus'),
};
};
const state = defaultState();
const getters = {}
const getters = {};
const mutations = {
GET_LOGIN(state, { userInfo, auditStatusInfo }) {
state.userInfo = userInfo;
state.auditStatusInfo = auditStatusInfo;
},
}
};
const actions = {
async GetAccountLogin({ commit }, params) {
const res = await GetAccountLogin(params);
if (res && res.status == 200) {
let mobile = ""
let mobile = '';
let isContain = res.data.user_mobile.indexOf("86");
let isContain = res.data.user_mobile.indexOf('86');
if (isContain != -1 && res.data.user_mobile.length > 11) {
mobile = res.data.user_mobile.slice(2);
} else {
mobile = res.data.user_mobile;
}
const result = await GetAuditStatus({ mobile: mobile });
if (result && result.status == 200) {
@ -63,56 +56,52 @@ const actions = {
commit('GET_LOGIN', { userInfo, auditStatusInfo });
uni.setStorageSync("uid", res.data.user_id);
uni.setStorageSync("ukey", res.data.key);
uni.setStorageSync("userInfo", res.data);
uni.setStorageSync('uid', res.data.user_id);
uni.setStorageSync('ukey', res.data.key);
uni.setStorageSync('userInfo', res.data);
// #ifdef H5
$cookies.set("uid", res.data.user_id);
$cookies.set("ukey", res.data.key);
$cookies.set('uid', res.data.user_id);
$cookies.set('ukey', res.data.key);
// #endif
// 如果是管理员 或者 通过的商家直接登录
if (
res.data.user_is_admin == 1 || result.data.signed_status == 2
) {
if (res.data.user_is_admin == 1 || result.data.signed_status == 2) {
uni.switchTab({
url: "/pages/order/order",
url: '/pages/order/order',
});
return
return;
}
if ([1, 2, 3].includes(result.data.approval_status)) {
uni.navigateTo({
url: "/pages/audit/checkAudit",
url: '/pages/audit/checkAudit',
});
return
return;
}
let approval_invalid_col = JSON.parse(result.data.approval_invalid_col);
if(result.data.approval_status == 4 || approval_invalid_col.includes('all')){
if (
result.data.approval_status == 4 ||
approval_invalid_col.includes('all')
) {
uni.navigateTo({
url: "/pages/audit/shop1",
url: '/pages/audit/shop1',
});
}
}
},
async GetLogin({ commit }, params) {
const res = await GetLogin(params)
const res = await GetLogin(params);
if (res && res.status == 200) {
let mobile = '';
let mobile = ""
let isContain = res.data.user_mobile.indexOf("86");
let isContain = res.data.user_mobile.indexOf('86');
if (isContain != -1 && res.data.user_mobile.length > 11) {
mobile = res.data.user_mobile.slice(2);
} else {
mobile = res.data.user_mobile;
@ -122,7 +111,6 @@ const actions = {
if (result && result.status == 200) {
res.data.merch_approval_status = result.data.approval_status;
}
const userInfo = res.data;
@ -130,49 +118,85 @@ const actions = {
commit('GET_LOGIN', { userInfo, auditStatusInfo });
uni.setStorageSync("uid", res.data.user_id);
uni.setStorageSync("ukey", res.data.key);
uni.setStorageSync("userInfo", res.data);
uni.setStorageSync('uid', res.data.user_id);
uni.setStorageSync('ukey', res.data.key);
uni.setStorageSync('userInfo', res.data);
// // #ifdef H5
// $cookies.set("uid", res.data.user_id);
// $cookies.set("ukey", res.data.key);
// // #endif
// 如果是管理员 或者 通过的商家直接登录
if (
res.data.user_is_admin == 1 || result.data.signed_status == 2
) {
if (res.data.user_is_admin == 1 || result.data.signed_status == 2) {
uni.switchTab({
url: "/pages/order/order",
url: '/pages/order/order',
});
return
return;
}
if ([1, 2, 3].includes(result.data.approval_status)) {
uni.navigateTo({
url: "/pages/audit/checkAudit",
url: '/pages/audit/checkAudit',
});
return
return;
}
let approval_invalid_col = JSON.parse(result.data.approval_invalid_col);
if(result.data.approval_status == 4 || approval_invalid_col.includes('all')){
if (
result.data.approval_status == 4 ||
approval_invalid_col.includes('all')
) {
uni.navigateTo({
url: "/pages/audit/shop1",
url: '/pages/audit/shop1',
});
}
}
},
LoginOut() {
uni.showModal({
title: '退出登录',
content: `您是否要退出登录?`,
success: async (res) => {
if (res.confirm) {
let res = await OutLogin();
if (res && res.status == 200) {
uni.removeStorageSync('ukey');
uni.removeStorageSync('uid');
uni.removeStorageSync('accountDashboard');
uni.removeStorageSync('approvalStatus');
uni.removeStorageSync('approvalStatusInfo');
uni.removeStorageSync('auditInfo');
uni.removeStorageSync('contractDownloadUrl');
uni.removeStorageSync('pdfjs.history');
uni.removeStorageSync('userInfo');
this.$store.state.user.ukey = '';
this.$store.state.user.uid = '';
this.$store.state.user.auditStatusInfo = {
approval_invalid_col: [],
approval_status: -4,
approval_remark: '',
id: 0,
};
setTimeout(() => {
uni.redirectTo({
url: '/pages/index/index',
});
}, 100);
}
} else if (res.cancel) {
}
},
});
},
};
export default {
namespaced: true,
state,
getters,
mutations,
actions
}
actions,
};

View File

@ -2,7 +2,7 @@
var isReady=false;var onReadyCallbacks=[];
var isServiceReady=false;var onServiceReadyCallbacks=[];
var __uniConfig = {"pages":["pages/index/index","pages/login/login","pages/audit/shop1","pages/audit/businessType","pages/audit/shop2","pages/audit/shop3","pages/audit/checkAudit","pages/audit/mapAddress","pages/agreement/agreement","pages/register/register","pages/forgetPassword/forgetPassword","pages/order/order","pages/IM/IM","pages/IM/IMmsgContent","pages/viewCenter/viewCenter","pages/manage/manage","pages/my/my","pages/my/shopInfo","pages/my/setting","pages/my/contract","pages/my/printer/printerList","pages/my/userInfo","pages/my/shopQRcode/shopQRcode","pages/my/protocol/protocol","pages/my/aboutUs/aboutUs","pages/my/aboutUs/records","pages/my/versions"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#FFFFFF","backgroundColor":"#FFFFFF","pageOrientation":"portrait","adjustPosition":true},"tabBar":{"color":"#000","selectedColor":"#4b71ff","borderStyle":"black","backgroundColor":"#ffffff","iconfontSrc":"/static/font/iconfont.ttf","fontSize":"14px","height":"58px","spacing":"5px","list":[{"pagePath":"pages/order/order","iconfont":{"text":"","selectedText":"","selectedColor":"#4b71ff","color":"#000","fontSize":"20px"},"text":"工作台"},{"pagePath":"pages/IM/IM","iconfont":{"text":"","selectedText":"","selectedColor":"#4b71ff","color":"#000","fontSize":"22px"},"text":"消息"},{"pagePath":"pages/viewCenter/viewCenter","iconfont":{"text":"","selectedText":"","selectedColor":"#4b71ff","color":"#000","fontSize":"20px"},"text":"视图中心"},{"pagePath":"pages/my/my","iconfont":{"text":"","selectedText":"","selectedColor":"#4b71ff","color":"#000","fontSize":"24px"},"text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"小发同城商家版","compilerVersion":"4.29","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/login/login","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/audit/shop1","meta":{},"window":{"navigationBarTitleText":"填写店铺信息第1步/共3步"}},{"path":"/pages/audit/businessType","meta":{},"window":{"navigationBarTitleText":"选择经营品类"}},{"path":"/pages/audit/shop2","meta":{},"window":{"navigationBarTitleText":"填写店铺信息第2步/共3步"}},{"path":"/pages/audit/shop3","meta":{},"window":{"navigationBarTitleText":"填写店铺信息第3步/共3步"}},{"path":"/pages/audit/checkAudit","meta":{},"window":{"navigationBarTitleText":"商户入驻申请"}},{"path":"/pages/audit/mapAddress","meta":{},"window":{"navigationBarTitleText":"选择地图地址"}},{"path":"/pages/agreement/agreement","meta":{},"window":{"navigationBarTitleText":"协议","style":{"navigationBarTitleText":"注册","navigationBarTextStyle":"white"}}},{"path":"/pages/register/register","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/forgetPassword/forgetPassword","meta":{},"window":{"navigationBarTitleText":"忘记密码"}},{"path":"/pages/order/order","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/IM/IM","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/IM/IMmsgContent","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/viewCenter/viewCenter","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/manage/manage","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/my/my","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/my/shopInfo","meta":{},"window":{"navigationBarTitleText":"店铺信息"}},{"path":"/pages/my/setting","meta":{},"window":{"navigationBarTitleText":"设置"}},{"path":"/pages/my/contract","meta":{},"window":{"navigationBarTitleText":"合同"}},{"path":"/pages/my/printer/printerList","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/my/userInfo","meta":{},"window":{"navigationBarTitleText":"个人信息"}},{"path":"/pages/my/shopQRcode/shopQRcode","meta":{},"window":{"navigationBarTitleText":"店铺二维码"}},{"path":"/pages/my/protocol/protocol","meta":{},"window":{"navigationBarTitleText":"隐私协议"}},{"path":"/pages/my/aboutUs/aboutUs","meta":{},"window":{"navigationBarTitleText":"关于我们"}},{"path":"/pages/my/aboutUs/records","meta":{},"window":{"navigationBarTitleText":"网址"}},{"path":"/pages/my/versions","meta":{},"window":{"navigationBarTitleText":"版本号"}}];
var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/login/login","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/audit/shop1","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/audit/businessType","meta":{},"window":{"navigationBarTitleText":"选择经营品类"}},{"path":"/pages/audit/shop2","meta":{},"window":{"navigationBarTitleText":"填写店铺信息第2步/共3步"}},{"path":"/pages/audit/shop3","meta":{},"window":{"navigationBarTitleText":"填写店铺信息第3步/共3步"}},{"path":"/pages/audit/checkAudit","meta":{},"window":{"navigationBarTitleText":"商户入驻申请"}},{"path":"/pages/audit/mapAddress","meta":{},"window":{"navigationBarTitleText":"选择地图地址"}},{"path":"/pages/agreement/agreement","meta":{},"window":{"navigationBarTitleText":"协议","style":{"navigationBarTitleText":"注册","navigationBarTextStyle":"white"}}},{"path":"/pages/register/register","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/forgetPassword/forgetPassword","meta":{},"window":{"navigationBarTitleText":"忘记密码"}},{"path":"/pages/order/order","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/IM/IM","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/IM/IMmsgContent","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/viewCenter/viewCenter","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/manage/manage","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/my/my","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/my/shopInfo","meta":{},"window":{"navigationBarTitleText":"店铺信息"}},{"path":"/pages/my/setting","meta":{},"window":{"navigationBarTitleText":"设置"}},{"path":"/pages/my/contract","meta":{},"window":{"navigationBarTitleText":"合同"}},{"path":"/pages/my/printer/printerList","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/my/userInfo","meta":{},"window":{"navigationBarTitleText":"个人信息"}},{"path":"/pages/my/shopQRcode/shopQRcode","meta":{},"window":{"navigationBarTitleText":"店铺二维码"}},{"path":"/pages/my/protocol/protocol","meta":{},"window":{"navigationBarTitleText":"隐私协议"}},{"path":"/pages/my/aboutUs/aboutUs","meta":{},"window":{"navigationBarTitleText":"关于我们"}},{"path":"/pages/my/aboutUs/records","meta":{},"window":{"navigationBarTitleText":"网址"}},{"path":"/pages/my/versions","meta":{},"window":{"navigationBarTitleText":"版本号"}}];
__uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
__uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

File diff suppressed because one or more lines are too long

View File

@ -4642,6 +4642,8 @@ __webpack_require__.r(__webpack_exports__);
var components
try {
components = {
uNavbar: __webpack_require__(/*! @/uni_modules/uview-ui/components/u-navbar/u-navbar.vue */ 43)
.default,
uForm: __webpack_require__(/*! @/uni_modules/uview-ui/components/u-form/u-form.vue */ 122)
.default,
uFormItem:
@ -4683,19 +4685,46 @@ var render = function () {
"uni-view",
{ staticClass: _vm._$g(0, "sc"), attrs: { _i: 0 } },
[
_c(
"u-navbar",
{ attrs: { _i: 1 } },
[
_c(
"template",
{ attrs: { _i: 2 }, slot: "right" },
[
_c(
"uni-view",
{
staticClass: _vm._$g(3, "sc"),
attrs: { _i: 3 },
on: {
click: function ($event) {
return _vm.$handleViewEvent($event)
},
},
},
[_vm._v("退出登录")]
),
],
1
),
],
2
),
_c(
"u-form",
{ ref: "uForm", staticClass: _vm._$g(1, "sc"), attrs: { _i: 1 } },
{ ref: "uForm", staticClass: _vm._$g(4, "sc"), attrs: { _i: 4 } },
[
_c(
"u-form-item",
{ attrs: { _i: 2 } },
{ attrs: { _i: 5 } },
[
_c("u-input", {
staticClass: _vm._$g(3, "sc"),
attrs: { _i: 3 },
staticClass: _vm._$g(6, "sc"),
attrs: { _i: 6 },
model: {
value: _vm._$g(3, "v-model"),
value: _vm._$g(6, "v-model"),
callback: function () {},
expression: "form.contact_name",
},
@ -4706,7 +4735,7 @@ var render = function () {
_c(
"u-form-item",
{
attrs: { _i: 4 },
attrs: { _i: 7 },
on: {
click: function ($event) {
return _vm.$handleViewEvent($event)
@ -4715,31 +4744,31 @@ var render = function () {
},
[
_c("u-input", {
staticClass: _vm._$g(5, "sc"),
staticClass: _vm._$g(8, "sc"),
staticStyle: { "pointer-events": "none" },
attrs: { _i: 5 },
attrs: { _i: 8 },
model: {
value: _vm._$g(5, "v-model"),
value: _vm._$g(8, "v-model"),
callback: function () {},
expression: "form.biz_category",
},
}),
_c("u-icon", {
staticStyle: { display: "inline-block", "margin-left": "8rpx" },
attrs: { _i: 6 },
attrs: { _i: 9 },
}),
],
1
),
_c(
"u-form-item",
{ attrs: { _i: 7 } },
{ attrs: { _i: 10 } },
[
_c("u-input", {
staticClass: _vm._$g(8, "sc"),
attrs: { _i: 8 },
staticClass: _vm._$g(11, "sc"),
attrs: { _i: 11 },
model: {
value: _vm._$g(8, "v-model"),
value: _vm._$g(11, "v-model"),
callback: function () {},
expression: "form.store_name",
},
@ -4750,7 +4779,7 @@ var render = function () {
_c(
"u-form-item",
{
attrs: { _i: 9 },
attrs: { _i: 12 },
on: {
click: function ($event) {
return _vm.$handleViewEvent($event)
@ -4759,31 +4788,31 @@ var render = function () {
},
[
_c("u-input", {
staticClass: _vm._$g(10, "sc"),
staticClass: _vm._$g(13, "sc"),
staticStyle: { "pointer-events": "none" },
attrs: { _i: 10 },
attrs: { _i: 13 },
model: {
value: _vm._$g(10, "v-model"),
value: _vm._$g(13, "v-model"),
callback: function () {},
expression: "form.mapAddress",
},
}),
_c("u-icon", {
staticStyle: { display: "inline-block", "margin-left": "8rpx" },
attrs: { _i: 11 },
attrs: { _i: 14 },
}),
],
1
),
_c(
"u-form-item",
{ attrs: { _i: 12 } },
{ attrs: { _i: 15 } },
[
_c("u-input", {
staticClass: _vm._$g(13, "sc"),
attrs: { _i: 13 },
staticClass: _vm._$g(16, "sc"),
attrs: { _i: 16 },
model: {
value: _vm._$g(13, "v-model"),
value: _vm._$g(16, "v-model"),
callback: function () {},
expression: "form.store_address",
},
@ -4793,11 +4822,11 @@ var render = function () {
),
_c(
"u-form-item",
{ attrs: { _i: 14 } },
{ attrs: { _i: 17 } },
[
_c("u-upload", {
class: _vm._$g(15, "c"),
attrs: { _i: 15 },
class: _vm._$g(18, "c"),
attrs: { _i: 18 },
on: {
afterRead: function ($event) {
return _vm.$handleViewEvent($event)
@ -4812,11 +4841,11 @@ var render = function () {
),
_c(
"u-form-item",
{ attrs: { _i: 16 } },
{ attrs: { _i: 19 } },
[
_c("u-upload", {
class: _vm._$g(17, "c"),
attrs: { _i: 17 },
class: _vm._$g(20, "c"),
attrs: { _i: 20 },
on: {
afterRead: function ($event) {
return _vm.$handleViewEvent($event)
@ -4834,13 +4863,13 @@ var render = function () {
),
_c(
"uni-view",
{ staticClass: _vm._$g(18, "sc"), attrs: { _i: 18 } },
{ staticClass: _vm._$g(21, "sc"), attrs: { _i: 21 } },
[
_c(
"u-button",
{
staticClass: _vm._$g(19, "sc"),
attrs: { _i: 19 },
staticClass: _vm._$g(22, "sc"),
attrs: { _i: 22 },
on: {
click: function ($event) {
return _vm.$handleViewEvent($event)
@ -4852,7 +4881,7 @@ var render = function () {
],
1
),
_c("u-toast", { ref: "uToast", attrs: { _i: 20 } }),
_c("u-toast", { ref: "uToast", attrs: { _i: 23 } }),
],
1
)