faiz
/
Huanyuyuehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
faiz 2024-04-19 14:05:09 +08:00
parent 8b8022ec76
commit 530a4a3dbe
8 changed files with 92 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
androidPrivacy.json
View File

@ -2,7 +2,7 @@
"version" : "1",
"prompt" : "template",
"title" : "服务协议与隐私政策",
"message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。<br/>\r\r
"message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。<br/>\r\r\r
\t你可以阅读 <a href=\"https://请修改为自己的域名/register.html\">《用户协议》</a> 与 <a href=\"https://请修改为自己的域名/protocol.html\">《隐私政策》</a>了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。",
"buttonAccept" : "同意并接受",
"buttonRefuse" : "暂不同意",

3
manifest.json
View File

@ -177,9 +177,6 @@
"usingComponents" : true
},
"h5" : {
"devServer" : {
"https" : false
},
"router" : {
"mode" : "history",
"base" : ""

74
pages/index/index.vue
View File

@ -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({

2
pages/product/list/index.vue
View File

@ -84,7 +84,7 @@
<view class="acea-row row-middle">
<view v-if="item.is_show == 1 && item.status == 1" class="bnt" @tap.stop="handleShelves(item,0)">下架</view>
<view v-if="item.is_show == 0 && item.status == 1" class="bnt" @tap.stop="handleShelves(item),1">上架</view>
<view @click="editGoods(item)" class="bnt">编辑</view>
<!-- <view @click="editGoods(item)" class="bnt">编辑</view> -->
<navigator :url="'/pages/admin/goods_details/index?product_id='+item.product_id+'&product_type=0'" class="bnt" hover-class='none'>预览</navigator>
<view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除</view>
<view class="bnt bnt_recommend" v-if="item.is_show == 1" @tap.stop="handleRecommend(item)">{{item.is_good ? '取消推荐' : '店铺推荐'}}</view>

3
pages/store/applicationRecord/index.vue
View File

@ -15,7 +15,8 @@
<image class="status-icon" v-else-if="item.status === 2" src="../static/images/not-pass.png" mode=""></image>
<text class="status-text">{{statusText(item.status)}}</text>
</view>
<view class="status-btn" @click="jump(item)">{{statusBtn(item.status)}}</view>
<view class="status-btn" v-if="item.status!=0" @click="jump(item)">{{statusBtn(item.status)}}</view>
<!-- <view class="status-btn" v-else @click="jump(item)">{{statusBtn(item.status)}}</view> -->
</view>
</view>
</view>

8
pages/store/merchantDetails/index.vue
View File

@ -14,12 +14,12 @@
<view class="phone">
<view class="">
<text class="head">商户账号：</text>
<text class="content">{{resData.phone}}</text>
<text class="content">{{resData.mer_account}}</text>
</view>
<text class="cope" @click="copyTBL()">复制</text>
</view>
</view>
<view class="btn" v-if="mer_id > 0">
<view class="btn">
<view class="">
温馨提示：初始密码默认为手机号后六位，请初次登录后及时修改
</view>
@ -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) {

4
pages/store/settled/index.vue
View File

@ -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,

15
pages/store/settled/step2.vue
View File

@ -31,7 +31,7 @@
<view class="uni-list-cell-db acea-row row-middle">
<text class="item-name required">身份证正、反面清晰照片</text>
<view class="">
{{shopInfo.idCardPhoto.length}}/2
{{shopInfo.idCardPhoto.length}}/3
</view>
</view>
<view class="acea-row row-middle">
@ -50,6 +50,10 @@
<text class='iconfont icon-icon25201' style="left: 25px;top: 10px;"></text>
<view>身份证反面</view>
</view>
<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.idCardPhoto)' v-else-if="shopInfo.idCardPhoto.length <3">
<text class='iconfont icon-icon25201' style="left: 25px;top: 10px;"></text>
<view>手持身份证</view>
</view>
</view>
</view>
</view>
@ -79,7 +83,7 @@
<text class="item-name required">法人身份证有效期开始</text>
<view class="acea-row row-middle">
<input style="text-align: right;" placeholder="请输入" type="text" v-model="shopInfo.idCardStartTime">
<input style="text-align: right;" placeholder="请输入" type="text" @input="validateBtn" v-model="shopInfo.idCardStartTime">
</view>
</view>
<view class="acea-row row-middle">
@ -98,7 +102,7 @@
<text class="item-name required">法人身份证有效期结束</text>
<view class="acea-row row-middle" >
<input style="text-align: right;" placeholder="请输入" type="text" v-model="shopInfo.idCardEndTime">
<input style="text-align: right;" placeholder="请输入" type="text" @input="validateBtn" v-model="shopInfo.idCardEndTime">
</view>
</view>
<view class="acea-row row-middle">
@ -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){