diff --git a/androidPrivacy.json b/androidPrivacy.json
index 8b67533..dc05560 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -2,7 +2,7 @@
"version" : "1",
"prompt" : "template",
"title" : "服务协议与隐私政策",
- "message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\r\r
+ "message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\r\r\r
\t你可以阅读 《用户协议》 与 《隐私政策》了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。",
"buttonAccept" : "同意并接受",
"buttonRefuse" : "暂不同意",
diff --git a/manifest.json b/manifest.json
index d6e76be..15588fc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -177,9 +177,6 @@
"usingComponents" : true
},
"h5" : {
- "devServer" : {
- "https" : false
- },
"router" : {
"mode" : "history",
"base" : ""
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9cfb623..4fbda4c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -792,10 +792,82 @@ export default {
let nowVersion = (inf.version).split('.').join('');
let appVersion = (res.data.appVersion).split('.').join('');
that.$set(that.appUpdate, 'alert', appVersion > nowVersion);
- that.alertAppUpdate();
+ // that.alertAppUpdate();
+ that.updataDowload();
});
})
},
+ updataDowload(){
+ var that = this;
+ switch (uni.getSystemInfoSync().platform) {
+ case 'android':
+ uni.showModal({
+ title: '更新提示',
+ content: '检测到新版本，即将进入更新',
+ showCancel: false,
+ success: (res) => {
+ if (res.confirm) {
+ const downloadTask = uni.downloadFile({
+ url: that.appUpdate.androidAddress,
+ success: (downloadResult) => {
+ if (downloadResult.statusCode === 200) {
+ plus.runtime.install(
+ downloadResult.tempFilePath,
+ {
+ force: true
+ },
+ function (e) {
+ uni.showModal({
+ title: '更新成功',
+ content: '更新完成,请重新启动app',
+ showCancel: false,
+ success: (res) => {
+ plus.runtime.quit();
+ }
+ });
+ },
+ function (e) {
+ uni.showModal({
+ title: '更新失败',
+ content: JSON.stringify(e),
+ showCancel: false,
+ success: (res) => {
+ console.log(res);
+ }
+ });
+ }
+ );
+ }
+ }
+ });
+
+ var showLoading = plus.nativeUI.showWaiting('正在下载'); //创建一个showWaiting对象
+ downloadTask.onProgressUpdate((res) => {
+ showLoading.setTitle(' 正在下载' + res.progress + '% ');
+ // 测试条件，取消下载任务。
+ if (res.progress === 100) {
+ plus.nativeUI.closeWaiting();
+ }
+ });
+ }
+ }
+ });
+ break;
+ case 'ios':
+ if (that.appUpdate.iosAddress) {
+ uni.showModal({
+ title:"更新提示",
+ content: '检测到新版本，即将进入更新',
+ success:(res)=> {
+ if(res.confirm){
+ plus.runtime.openURL(data.appstore);
+ }
+ }
+ })
+ }
+ break;
+ }
+ },
alertAppUpdate(){
if(this.appUpdate.alert) {
uni.getSystemInfo({
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index cccba87..565dc9c 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -84,7 +84,7 @@
下架
上架
- 编辑
+
预览
删除
{{item.is_good ? '取消推荐' : '店铺推荐'}}
diff --git a/pages/store/applicationRecord/index.vue b/pages/store/applicationRecord/index.vue
index 19b73ca..92ca1cf 100644
--- a/pages/store/applicationRecord/index.vue
+++ b/pages/store/applicationRecord/index.vue
@@ -15,7 +15,8 @@
{{statusText(item.status)}}
- {{statusBtn(item.status)}}
+ {{statusBtn(item.status)}}
+
diff --git a/pages/store/merchantDetails/index.vue b/pages/store/merchantDetails/index.vue
index 97e60b4..66ee3ce 100644
--- a/pages/store/merchantDetails/index.vue
+++ b/pages/store/merchantDetails/index.vue
@@ -14,12 +14,12 @@
商户账号：
- {{resData.phone}}
+ {{resData.mer_account}}
复制
-
+
温馨提示：初始密码默认为手机号后六位，请初次登录后及时修改
@@ -41,9 +41,7 @@
},
onLoad(e) {
this.mer_id = e.mer_id
- if (this.mer_id > 0) {
- this.getGoodsDetails(e.mer_i_id)
- }
+ this.getGoodsDetails(e.mer_i_id)
},
methods: {
getGoodsDetails(id) {
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 394ce61..6b346e7 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -498,9 +498,9 @@
this.validate=false;
}else{
let date2 = {
- phone: userPhone,
+ phone: EnterprisePhone,
mer_name:shopName,
- name:userName,
+ name:EnterpriseJoinName,
mer_type_id:mer_type,//hjb 这里应该是设置反了
com:{
name:EnterpriseName,
diff --git a/pages/store/settled/step2.vue b/pages/store/settled/step2.vue
index 5d71cd8..582e8a1 100644
--- a/pages/store/settled/step2.vue
+++ b/pages/store/settled/step2.vue
@@ -31,7 +31,7 @@
身份证正、反面清晰照片
- {{shopInfo.idCardPhoto.length}}/2
+ {{shopInfo.idCardPhoto.length}}/3
@@ -50,6 +50,10 @@
身份证反面
+
+
+ 手持身份证
+
@@ -79,7 +83,7 @@
法人身份证有效期开始
-
+
@@ -98,7 +102,7 @@
法人身份证有效期结束
-
+
@@ -353,6 +357,7 @@
let idcard={
image1:idCardPhoto[0],
image2:idCardPhoto[1],
+ image3:idCardPhoto[2],
name:idCardName,
number:idCardNumber,
start:idCardStartTime,
@@ -385,10 +390,10 @@
this.validateBtn();
},
nextStep(){
- if(this.shopInfo.idCardPhoto.length!=2){
+ if(this.shopInfo.idCardPhoto.length!=3){
uni.showToast({
icon:'none',
- title: '请上传身份证正反面'
+ title: '请上传身份证正反面与手持身份证'
});
return
}else if(this.shopInfo.businessLicense.length!=1){