diff --git a/App.vue b/App.vue
index 715700f..d9f7407 100644
--- a/App.vue
+++ b/App.vue
@@ -162,6 +162,9 @@
// this.audioTeam.push(result.extras.type);
// }
}
+
+ console.log("收到消息")
+ console.log(result)
// 点击事件
if (notificationEventType == 'notificationOpened') {
if (result.extras.type == 2) {
diff --git a/manifest.json b/manifest.json
index 5b3b237..c94f62d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name": "惠农生活",
"appid": "__UNI__3A527D1",
"description": "",
- "versionName": "2.0.45",
- "versionCode": 2045,
+ "versionName": "2.0.48",
+ "versionCode": 2048,
"transformPx": false,
/* 5+App特有相关 */
"app-plus": {
diff --git a/pages/gather/subnvue/concat.nvue b/pages/gather/subnvue/concat.nvue
index 687119e..85ac458 100644
--- a/pages/gather/subnvue/concat.nvue
+++ b/pages/gather/subnvue/concat.nvue
@@ -180,7 +180,7 @@
.next-btn {
position: absolute;
- bottom: 100rpx;
+ bottom: 100px;
left: 375rpx;
transform: translateX(-50%);
width: 240rpx;
diff --git a/pages/index/subnvue/concat.nvue b/pages/index/subnvue/concat.nvue
index 8ff2f18..f09af6a 100644
--- a/pages/index/subnvue/concat.nvue
+++ b/pages/index/subnvue/concat.nvue
@@ -19,7 +19,7 @@
-
+
工作台
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index aaee40a..4a44e27 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -1,270 +1,297 @@
-
-
-
-
-
-
-
- 商户入住
+
+
+
+
+
-
- 申请记录
+
+ {{detail.title}}
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+ 商户入住
+
+
+ 申请记录
+
+
-
- 简单3步 享开店好礼
-
-
-
-
- 1
-
-
- 添加店铺
-
+
+
-
-
-
- 2
-
-
- 资质认证
-
+
+ 简单3步 享开店好礼
-
-
-
- 3
+
+
+
+ 1
+
+
+ 添加店铺
+
-
- 入驻审核
+
+
+
+ 2
+
+
+ 资质认证
+
+
+
+
+
+ 3
+
+
+ 入驻审核
+
-
-
-
-
-
-
-
-
-
- 店铺名称
-
-
-
-
-
-
- 店铺分类
-
-
-
- {{formData.merchant_category_name|| '请选择店铺分类'}}
-
-
-
-
- {{formData.mer_storeType||'请选择店铺类型'}}
-
-
-
-
-
-
-
-
-
-
- 公司性质
+
+
+
+
+
+
+
+ 店铺名称
+
+
+
-
-
- {{formData.is_company?'对公户':'个体户'}}
-
+
+
+ 店铺分类
+
+
+
+ {{formData.merchant_category_name|| '请选择店铺分类'}}
+
+
+
+
+ {{formData.mer_storeType||'请选择店铺类型'}}
+
+
-
-
- 请上传营业执照
+
+
+
+
+
+
+ 公司性质
+
+
+
+ {{formData.is_company?'对公户':'个体户'}}
+
+
+
-
-
-
+
+ 请上传营业执照
+
+
+
+
+
+
+ 上传图片
+
+
+
+
+
+
+ 店铺资质
+
+
+
+
+ 详细地址
+
+
+
+
+
+
+ 公司名称
+
+
+
+
+
+
+ 法人名称
+
+
+
+
+
+
+ 社会信用代码
+
+
+
+
+
+
+
+ 其他相关资质证明
+
+
+
-
-
- 上传图片
+
+
+
+ 上传图片
+
+
+
+
+
+
+ 电话认证
+
+
+
+ 联系电话 {{formData.phone}}
+
+
+
+
+ 验证码
+
+
+
+
+
-
-
- 店铺资质
+
+
+
+
+
+ 店铺等待审核
-
-
-
- 详细地址
-
-
+
+ 店铺已提交入驻申请
+
+
+
+ {{formData.mer_name}}
+ 等待审核
+ 审核通过
+ 审核失败
-
-
-
- 公司名称
-
-
+
+ 提交时间：{{formData.create_time}}
-
-
-
- 法人名称
-
-
+
+
+ 备注：{{formData.fail_msg}}
-
-
-
- 社会信用代码
-
-
+
+
+ 可以登录我们的工作台，把您的商品推向市场了
+
-
-
- 其他相关资质证明
+
+
+
+
+
+
+ 《入驻协议》
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- 上传图片
-
-
-
-
-
-
- 电话认证
-
-
-
- 联系电话 {{formData.phone}}
-
-
-
-
- 验证码
-
-
-
-
-
-
+ '商户入驻协议'
+
+
-
-
-
-
-
- 店铺等待审核
-
-
- 店铺已提交入驻申请
-
-
-
- {{formData.mer_name}}
- 等待审核
- 审核通过
- 审核失败
-
-
- 提交时间：{{formData.create_time}}
-
-
-
- 备注：{{formData.fail_msg}}
-
-
-
- 可以登录我们的工作台，把您的商品推向市场了
-
-
-
-
-
-
-
-
-
-
- 《入驻协议》
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- '商户入驻协议'
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 62728fb..643dd23 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -148,9 +148,9 @@
完成并登录
-
+
@@ -173,13 +173,13 @@
-
-->
-
+
找回密码
确认
-
+
-
+
@@ -48,7 +55,9 @@
// | Author: CRMEB Team
// +----------------------------------------------------------------------
const app = getApp();
- import { mapGetters} from "vuex";
+ import {
+ mapGetters
+ } from "vuex";
import sendVerifyCode from "@/mixins/SendVerifyCode";
import {
registerVerify,
@@ -56,19 +65,25 @@
getCodeApi,
getCaptcha
} from "@/api/user";
- import { validatorDefaultCatch } from "@/utils/dialog";
+ import {
+ validatorDefaultCatch
+ } from "@/utils/dialog";
import attrs, {
required,
alpha_num,
chs_phone
} from "@/utils/validate";
- import { configMap } from '@/utils';
- import { HTTP_REQUEST_URL } from '@/config/app';
- import Verify from '@/components/verify/verify.vue';
+ import {
+ configMap
+ } from '@/utils';
+ import {
+ HTTP_REQUEST_URL
+ } from '@/config/app';
+ import Verify from '@/components/verify/verify.vue';
export default {
name: "RetrievePassword",
- components: {
- Verify
+ components: {
+ Verify
},
mixins: [sendVerifyCode],
data: function() {
@@ -85,16 +100,14 @@
};
},
computed: configMap(['login_logo'], mapGetters(['viewColor'])),
- onReady() {
- },
- mounted: function() {
- },
+ onReady() {},
+ mounted: function() {},
methods: {
back() {
uni.navigateBack();
},
again() {
- this.codeUrl = VUE_APP_API_URL + "/captcha?" + this.keyCode + Date.parse(new Date());
+ this.codeUrl = VUE_APP_API_URL + "/captcha?" + this.keyCode + Date.parse(new Date());
},
async code(data) {
@@ -108,7 +121,7 @@
await registerVerify({
phone: that.account,
type: 'change_pwd',
- captchaType: 'blockPuzzle',
+ captchaType: 'blockPuzzle',
captchaVerification: data.captchaVerification
})
.then(res => {
@@ -169,7 +182,7 @@
})
});
},
- success(data) {
+ success(data) {
this.$refs.verify.hide();
this.code(data);
},
@@ -180,13 +193,15 @@
};
+
\ No newline at end of file
diff --git a/static/images/ydwd.png b/static/images/ydwd.png
index 05198bc..5a4ff90 100644
Binary files a/static/images/ydwd.png and b/static/images/ydwd.png differ