diff --git a/java-mall-app-shop-admin/.hbuilderx/launch.json b/java-mall-app-shop-admin/.hbuilderx/launch.json
index fe7f40f..7f1f4d4 100644
--- a/java-mall-app-shop-admin/.hbuilderx/launch.json
+++ b/java-mall-app-shop-admin/.hbuilderx/launch.json
@@ -4,23 +4,24 @@
"version" : "0.0",
"configurations" : [
{
- "app-plus" :
- {
- "launchtype" : "local"
- },
- "default" :
- {
- "launchtype" : "local"
- },
- "mp-weixin" :
- {
- "launchtype" : "local"
- },
- "type" : "uniCloud"
+ "app-plus" : {
+ "launchtype" : "local"
+ },
+ "default" : {
+ "launchtype" : "local"
+ },
+ "mp-weixin" : {
+ "launchtype" : "local"
+ },
+ "type" : "uniCloud"
},
{
"playground" : "standard",
"type" : "uni-app:app-android"
+ },
+ {
+ "playground" : "standard",
+ "type" : "uni-app:app-ios"
}
]
}
diff --git a/java-mall-app-shop-admin/App.vue b/java-mall-app-shop-admin/App.vue
index bd46689..188211e 100644
--- a/java-mall-app-shop-admin/App.vue
+++ b/java-mall-app-shop-admin/App.vue
@@ -3,6 +3,7 @@
import APPUpdate, { getCurrentNo } from "@/config/appUpdate";
// #endif
import { mapState, mapActions } from "vuex";
+import GtPush from "@/utils/gtpush-min.js";
export default {
data() {
return {
@@ -21,6 +22,39 @@ export default {
this.onAPPUpdate();
}
+ // plus.push.addEventListener("click", function (msg) {
+ // if (permision.isIOS) {
+ // console.log("ios:click收到" + JSON.parse(JSON.stringify(msg)).payload);
+ // var obj = JSON.parse(JSON.stringify(msg)).payload;
+ // that.toPushMessagePage(obj.data ? obj.data : obj);
+ // } else {
+ // console.log("安卓:click收到" + JSON.parse(JSON.stringify(msg)));
+ // var obj = JSON.parse(JSON.stringify(msg)).payload;
+ // that.toPushMessagePage(obj.data ? obj.data : obj);
+ // }
+ // });
+ // plus.push.addEventListener("receive", (message) => {
+ // console.log("receive收到");
+ // //收到透传消息，执行该事件
+ // let payload = message.payload; //自定义内容获取
+ // let text = message.payload.text;
+
+ // if (permision.isIOS) {
+ // console.log("ios:receive收到");
+ // let payload = message.payload; //自定义内容获取
+ // let text = message.content;
+ // that.createLocalMessage(text, payload);
+ // } else {
+ // console.log("安卓收到");
+ // that.toPushMessagePage(payload);
+ // }
+ // });
+
+ this.initAppOrderPush();
+ // #endif
+
+ // #ifdef H5
+ this.initH5OrderPush();
// #endif
},
computed: {
@@ -40,6 +74,124 @@ export default {
onAPPUpdate() {
APPUpdate(this.version);
},
+ getCidAsync() {
+ return new Promise(function (resolve, reject) {
+ // 获取客户端推送信息
+ plus.push.getClientInfoAsync(
+ function (clientInfo) {
+ // 获取CID
+ var cid = clientInfo.clientid;
+ // 调用resolve方法返回CID
+ resolve(cid);
+ },
+ function (error) {
+ // 获取CID失败，调用reject方法返回错误信息
+ reject(error);
+ }
+ );
+ });
+ },
+
+ initH5OrderPush() {
+ let _this = this;
+ GtPush.setDebugMode(true);
+ GtPush.init({
+ appid: "KXgzOaKSzd5HG3p9IPaVa8",
+ onClientId: (res) => {
+ console.log("onClientId = " + res.cid);
+ _this.cid = res.cid;
+ },
+ onlineState: (res) => {
+ console.log("onlineState = " + res.online);
+ _this.online = res.online;
+ },
+ onPushMsg: (res) => {
+ console.log("onPushMsg = " + res.message);
+ debugger;
+ _this.messages += "onPushMsg: " + res.message + "\n";
+ },
+ onError: (res) => {
+ _this.messages += "onError: " + res.error + "\n";
+ },
+ });
+ },
+ async initAppOrderPush() {
+ var pinf = plus.push.getClientInfo();
+ var cid = pinf.clientid; //客户端标识
+
+ console.log("当前机子CID：", cid);
+
+ plus.push.getClientInfoAsync((info) => {
+ let cid = info["clientid"];
+ console.log("当前机子CID：", cid);
+ });
+
+ let res = await this.getCidAsync();
+ console.log("getCidAsync", res);
+
+ uni.setClipboardData({
+ data: cid, // 需要复制的内容
+ success: () => {
+ // 成功提示框显示 1 秒钟
+ uni.showToast({
+ title: "复制成功",
+ icon: "success",
+ duration: 1000,
+ });
+ },
+ fail: () => {
+ // 失败提示框显示 1 秒钟
+ uni.showToast({
+ title: "复制失败，请重试",
+ icon: "none",
+ duration: 1000,
+ });
+ },
+ });
+
+ uni.showToast({
+ title: cid,
+ icon: "success",
+ duration: 20000,
+ });
+
+ const _self = this;
+ //监听系统通知栏消息点击事件
+ plus.push.addEventListener(
+ "click",
+ function (message) {
+ //处理点击消息的业务逻辑代码
+ console.log(message);
+ plus.nativeUI.toast("click:" + JSON.stringify(message));
+ //plus.nativeUI.toast('push click');
+ _self._handlePush(message);
+ uni.showToast({
+ title: message,
+ icon: "none",
+ duration: 1000,
+ });
+ },
+ false
+ );
+
+ //监听接收透传消息事件
+ plus.push.addEventListener(
+ "receive",
+ function (message) {
+ console.log(message);
+ plus.nativeUI.toast("receive:" + JSON.stringify(message));
+ //处理透传消息的业务逻辑代码
+ //plus.nativeUI.toast('push receive');
+ _self._handlePush(message);
+ uni.showToast({
+ title: message,
+ icon: "none",
+ duration: 1000,
+ });
+ },
+ false
+ );
+ },
},
};
diff --git a/java-mall-app-shop-admin/api/order.js b/java-mall-app-shop-admin/api/order.js
index 84d37db..0a87857 100644
--- a/java-mall-app-shop-admin/api/order.js
+++ b/java-mall-app-shop-admin/api/order.js
@@ -63,20 +63,3 @@ export function GetOrderList(params) {
// }).catch(e => reject(console.warn(e)))
// })
// }
-
-/**
- * 获取订单个推
- * @author Seven
- * @data 2025-3-28
- * @param channel
- * @returns { cid:f9da7081a7951cff6d7f1d4e2d2f270b }
- * @see https://mall.gpxscs.cn/api/mobile/account/login/push/testcase
- */
-
-export function GetOrderPush(params) {
- return http({
- url: "/account/login/push/testcase",
- method: "post",
- data: params,
- });
-}
diff --git a/java-mall-app-shop-admin/main.js b/java-mall-app-shop-admin/main.js
index c97f673..aa2c81c 100644
--- a/java-mall-app-shop-admin/main.js
+++ b/java-mall-app-shop-admin/main.js
@@ -5,8 +5,6 @@ import uView from "@/uni_modules/uview-ui";
import "./uni.promisify.adaptor";
import tui from "./utils/httpRequest";
import Socket from "./utils/socket.js";
-// import Utils from './utils/http'
-// import "@/static/font/iconfont.css"
Vue.use(uView);
diff --git a/java-mall-app-shop-admin/manifest.json b/java-mall-app-shop-admin/manifest.json
index b56492c..85cafdd 100644
--- a/java-mall-app-shop-admin/manifest.json
+++ b/java-mall-app-shop-admin/manifest.json
@@ -23,7 +23,8 @@
"Camera" : {},
"Record" : {},
"VideoPlayer" : {},
- "UIWebview" : {}
+ "UIWebview" : {},
+ "Push" : {}
},
/* 应用发布信息 */
"distribute" : {
@@ -63,7 +64,23 @@
/* SDK配置 */
"sdkConfigs" : {
"maps" : {},
- "push" : {}
+ "push" : {
+ "unipush" : {
+ "offline" : true,
+ "fcm" : {},
+ "honor" : {},
+ "meizu" : {},
+ "mi" : {},
+ "vivo" : {},
+ "oppo" : {},
+ "hms" : {}
+ },
+ "igexin" : {
+ "appid" : "KXgzOaKSzd5HG3p9IPaVa8",
+ "appkey" : "neXXX9r1Tc7gMxN2PIcHA1",
+ "appsecret" : "aQQys9eufd8KHH1Y0kfQm6"
+ }
+ }
},
"icons" : {
"android" : {
@@ -96,6 +113,9 @@
"spotlight@3x" : "unpackage/res/icons/120x120.png"
}
}
+ },
+ "splashscreen" : {
+ "androidStyle" : "common"
}
}
},
diff --git a/java-mall-app-shop-admin/pages.json b/java-mall-app-shop-admin/pages.json
index 73ac0cd..f307a03 100644
--- a/java-mall-app-shop-admin/pages.json
+++ b/java-mall-app-shop-admin/pages.json
@@ -59,6 +59,12 @@
"navigationBarTitleText": "填写地区信息"
}
},
+ {
+ "path": "pages/audit/contractSigning",
+ "style": {
+ "navigationBarTitleText": "合同签署"
+ }
+ },
{
"path": "pages/agreement/agreement",
"style": {
diff --git a/java-mall-app-shop-admin/pages/audit/checkAudit.vue b/java-mall-app-shop-admin/pages/audit/checkAudit.vue
index 28f61d5..4f267d9 100644
--- a/java-mall-app-shop-admin/pages/audit/checkAudit.vue
+++ b/java-mall-app-shop-admin/pages/audit/checkAudit.vue
@@ -53,7 +53,13 @@
拒绝原因：{{ auditInfo.approval_remark }}
-
+
审核中，1-7个工作日内答复，请耐心等待
@@ -61,6 +67,30 @@
暂无申请记录！
+
+
+ 申请通过：请在24小时内签署合同，过期会失效！
+
+
+
+ 店铺初始化中，请耐心等待。
+
+
+
+ 进件失败，需要管理员处理
+
申请时间:{{ auditInfo.created_at }}
@@ -215,7 +245,7 @@
>
您还没有签署，请签署
立即签署
@@ -373,6 +403,7 @@ export default {
approval_remark: "",
approval_invalid_col: [],
};
+ this.auditInfo.has_apply_mer = 2;
if (!res.data) {
this.showLoading = false;
@@ -669,8 +700,14 @@ export default {
let validity = ocr.validity.split("-");
this.startTime = validity[0];
this.endTime = validity[1];
- this.form.individual_id_period_begin = this.startTime;
- this.form.individual_id_period_end = this.endTime;
+ this.form.individual_id_period_begin = this.startTime.replace(
+ /\./g,
+ "-"
+ );
+ this.form.individual_id_period_end = this.endTime.replace(
+ /\./g,
+ "-"
+ );
}
break;
// 银行
@@ -1042,7 +1079,11 @@ export default {
}
}
},
- skipuContract() {},
+ skipuContract() {
+ uni.navigateTo({
+ url: `/pages/audit/contractSigning?url=${this.auditInfo.lkl_ec_result_url}`,
+ });
+ },
loginOut() {
this.$store.dispatch("user/LoginOut");
},
@@ -1104,6 +1145,16 @@ export default {
background-size: 100% 100%;
}
+ .img-pass-audit {
+ margin: 0 auto;
+ margin-top: 17%;
+ margin-bottom: 20%;
+ width: 400rpx;
+ height: 400rpx;
+ background-image: url("../../static/pass.png");
+ background-size: 100% 100%;
+ }
+
.tips {
margin-bottom: 24rpx;
text-align: center;
diff --git a/java-mall-app-shop-admin/pages/audit/contractSigning.vue b/java-mall-app-shop-admin/pages/audit/contractSigning.vue
new file mode 100644
index 0000000..188044e
--- /dev/null
+++ b/java-mall-app-shop-admin/pages/audit/contractSigning.vue
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
diff --git a/java-mall-app-shop-admin/pages/audit/shop1.vue b/java-mall-app-shop-admin/pages/audit/shop1.vue
index 00b4bfe..e64e63c 100644
--- a/java-mall-app-shop-admin/pages/audit/shop1.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop1.vue
@@ -103,6 +103,8 @@
:width="'100%'"
:height="154"
:upload-text="''"
+ :maxSize="8 * 1024 * 1024"
+ @oversize="overSize"
>
@@ -116,6 +118,8 @@
:width="'100%'"
:height="154"
:upload-text="''"
+ :maxSize="8 * 1024 * 1024"
+ @oversize="overSize"
>
@@ -222,6 +226,9 @@ export default {
pageBack() {
uni.navigateBack();
},
+ overSize(e) {
+ uni.$u.toast("上传图片大小不能超过8MB!");
+ },
async afterRead1(e) {
const item = e.file;
const imgUrl = item.url;
diff --git a/java-mall-app-shop-admin/pages/audit/shop2.vue b/java-mall-app-shop-admin/pages/audit/shop2.vue
index b0f17de..d9028dd 100644
--- a/java-mall-app-shop-admin/pages/audit/shop2.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop2.vue
@@ -53,6 +53,8 @@
:max-count="1"
width="125"
height="88"
+ :maxSize="8 * 1024 * 1024"
+ @oversize="overSize"
uploadText="点击上传营业执照"
>
@@ -128,6 +130,8 @@
"
:fileList="form.specialLicenseFiles"
:max-count="5"
+ :maxSize="8 * 1024 * 1024"
+ @oversize="overSize"
width="125"
height="88"
>
@@ -160,6 +164,8 @@
width="180"
height="110"
uploadIcon=""
+ :maxSize="8 * 1024 * 1024"
+ @oversize="overSize"
>
{
const batchNoRes = await batchNoApi(filePath, file, type);
const batchNo = batchNoRes.batchNo;
@@ -716,6 +733,7 @@ export default {
});
const imgOcrRes = await imgOcrResultApi(formDataStr);
+
clearTimeout(this.orcTimeout);
resolve(imgOcrRes?.data);
}, 1000);
@@ -792,6 +810,10 @@ export default {
this.form.legal_person_name = ocr.bizLicenseOwnerName;
this.form.biz_license_number = ocr.bizLicenseCreditCode;
this.form.biz_license_content = ocr.bizLicenseScope || "";
+ this.form.biz_license_period_begin = ocr.bizLicenseStartTime
+ .replace(/年|月|日/g, "-")
+ .replace(/-$/g, "")
+ .replace(/-+/g, "-");
console.log("BUSINESS_LICENCE", ocr);
break;
case "licenseNumber":
@@ -818,9 +840,14 @@ export default {
let validity = ocr.validity.split("-");
this.startTime = validity[0];
this.endTime = validity[1];
-
- this.form.legal_person_id_period_begin = this.startTime;
- this.form.legal_person_id_period_end = this.endTime;
+ this.form.legal_person_id_period_begin = this.startTime.replace(
+ /\./g,
+ "-"
+ );
+ this.form.legal_person_id_period_end = this.endTime.replace(
+ /\./g,
+ "-"
+ );
}
break;
diff --git a/java-mall-app-shop-admin/pages/index/index.vue b/java-mall-app-shop-admin/pages/index/index.vue
index 2112627..fee3da0 100644
--- a/java-mall-app-shop-admin/pages/index/index.vue
+++ b/java-mall-app-shop-admin/pages/index/index.vue
@@ -72,6 +72,8 @@ export default {
height: 240rpx;
margin: 50% auto;
margin-bottom: 32rpx;
+ border-radius: 12rpx;
+ overflow: hidden;
}
.app-name {
diff --git a/java-mall-app-shop-admin/pages/my/versions.vue b/java-mall-app-shop-admin/pages/my/versions.vue
index 6e09d40..b7d0ec5 100644
--- a/java-mall-app-shop-admin/pages/my/versions.vue
+++ b/java-mall-app-shop-admin/pages/my/versions.vue
@@ -26,12 +26,14 @@ export default {