admin/lichebao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加双方约定

Browse Source
This commit is contained in:
老叶
2022-04-21 16:21:30 +08:00
parent 578632742e
commit 939ae79a42
7 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.js
-1
View File
@@ -145,7 +145,6 @@ App({
success: function (res) {
if (res.confirm) {
// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
wx.setStorageSync('applyUpdate',true);
updateManager.applyUpdate()
}
}
pages/index/index.js
+13 -13
View File
@@ -47,18 +47,18 @@ Page({
banneractive3: 0,
remindTab:[],//调拨盘点入口
remindMsg:[],//调拨盘点弹框
isShowUpdate:false,//是否显示版本更新
update:{
title:'V3.0.16 更新说明',
isShowVersionInfo:false,//是否显示版本更新
versionInfo:{
number:'V3.0.17',
list:[
// '新增 库存盘点',
// '优化 客户建卡',
//'修复订单详情中销售顾问显示错误的问题',
'新增订单需在当天完成下定，隔天作废；',
'登记订单时，新增【上牌城市】选项；',
'按揭信息新增【分期期数】字段；',
'门店录入的线索手机号码开放展示；',
'调整了客户列表及客户详情的信息展示；',
// '新增订单需在当天完成下定，隔天作废；',
// '登记订单时，新增【上牌城市】选项；',
// '按揭信息新增【分期期数】字段；',
// '门店录入的线索手机号码开放展示；',
// '调整了客户列表及客户详情的信息展示；',
],
},
},
@@ -87,9 +87,9 @@ Page({
})
//判断是否显示版本更新内容
if(this.data.update.list.length>0&&app.getStorageByKey("applyUpdate")){
if(this.data.versionInfo.list.length>0&&app.getStorageByKey("appversion")!=this.data.versionInfo.number){
this.setData({
isShowUpdate:true,
isShowVersionInfo:true,
})
}
@@ -484,11 +484,11 @@ Page({
},
//关闭版本提示
closeUpdate(){
closeVersionInfo(){
this.setData({
isShowUpdate:false,
isShowVersionInfo:false,
})
app.setStorage('applyUpdate',false)
app.setStorage('appversion',this.data.versionInfo.number)
},
//页面相关事件处理函数--监听用户下拉动作
pages/index/index.wxml
+6 -6
View File
@@ -161,7 +161,7 @@
<lcb-shopTabBarNav currentIndex='0'></lcb-shopTabBarNav>
<!-- 客服提示 -->
<lcb-msg isShow="{{!isShowUpdate&&isShowNotice}}">
<lcb-msg isShow="{{!isShowVersionInfo&&isShowNotice}}">
<view slot="content">
<view class="mt40 text-center relative overflowhidden" style="height:100px;">
<!-- <image class='img-w-280' show-menu-by-longpress='true' lazy-load="{{true}}" mode="widthFix" src="https://qs.haodian.cn/wechat_app/lichebao/index/jrKF-code2.jpg"></image> -->
@@ -182,7 +182,7 @@
</lcb-msg>
<!-- 调拨提醒 盘点提醒 -->
<lcb-msg isShow="{{!isShowUpdate&&isShowReport}}">
<lcb-msg isShow="{{!isShowVersionInfo&&isShowReport}}">
<view slot="content">
<swiper class='wp100' style="height:550rpx;" autoplay circular bindchange="bannerChange">
<swiper-item class="relative" wx:for="{{remindMsg}}" wx:key="index">
@@ -208,7 +208,7 @@
</lcb-msg>
<!-- 库存提醒 -->
<lcb-msg isShow="{{!isShowUpdate&&!isShowReport&&isShowGoods}}">
<lcb-msg isShow="{{!isShowVersionInfo&&!isShowReport&&isShowGoods}}">
<view slot="content" class="inner40" style="width:550rpx;">
<view class="text-center font-36">{{warning.title}}</view>
<view class="mt10 text-center font-22 color-f9394d">{{warning.note}}</view>
@@ -241,11 +241,11 @@
</lcb-msg>
<!-- 更新新版本提醒 -->
<lcb-msg isShow="{{isShowUpdate}}" isBottomOpt="{{true}}" closeWord="我知道了" bind:closeevent="closeUpdate">
<lcb-msg isShow="{{isShowVersionInfo}}" isBottomOpt="{{true}}" closeWord="我知道了" bind:closeevent="closeVersionInfo">
<view slot="content" class="inner40 text-center" style="width:550rpx;">
<view class="font-36">{{update.title}}</view>
<view class="font-36">{{versionInfo.number}} 更新说明</view>
<view class="inline-block mt10 font-28 color-666">
<view class="mt15 text-left" wx:for-items="{{update.list}}" wx:key='index'>{{index+1}}、{{item}}</view>
<view class="mt15 text-left" wx:for-items="{{versionInfo.list}}" wx:key='index'>{{index+1}}、{{item}}</view>
</view>
</view>
</lcb-msg>
pages/order/edit/index2.js
+6
View File
@@ -72,6 +72,8 @@ Page({
business_type:0,//0未执行到商务政策 1商务政策执行中 2商务政策成功 3商务政策失败
sa:'',//双方约定
},
//生命周期函数--监听页面加载
onLoad: function (options) {
@@ -96,6 +98,7 @@ Page({
this.setData({
info:res.data,
delry_time:res.data.delry_time?res.data.delry_time:'',
sa:res.data.sa?res.data.sa:'',
//if_fine:res.data.if_fine==1?true:false,
})
@@ -813,6 +816,9 @@ Page({
params['delry_time'] = that.data.delry_time;
params['business_id'] = that.data.priceinfo.id;
params['disc_money'] = that.data.priceinfo.sdisc_money?that.data.priceinfo.sdisc_money:0;
if(that.data.sa != ''){
params['sa'] = that.data.sa;
}
let srv_arr = []
that.data.agencyList.forEach(item => {
if(item.checked){
pages/order/edit/index2.wxml
+10
View File
@@ -178,6 +178,10 @@
</view>
</view>
</block>
<view class="relative bbs-1-eb last-b-none pl180 font-28">
<view class="absolute left-0 box-middle color-333">双方约定</view>
<view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">{{sa}}</view>
</view>
</block>
<block wx:else>
<!-- <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.fine_money}}">
@@ -247,6 +251,8 @@
<view class="mb20 inner20 bds-2-36afa2 text-center font-28 color-36afa2 ulib-r10" bindtap="addFine"><i class="iconfont mr10 font-24 icon-jia1"></i>添加</view>
</view>
</view>
<view class="relative pt30 font-28 color-333">双方约定</view>
<textarea class="wp100 mt20 inner20 line-height-16 bg-f6 font-28 ulib-r10" style="height:180rpx;" placeholder-class="color-ccc" placeholder="请填写双方约定" model:value='{{sa}}' />
</block>
</block>
</view>
@@ -355,6 +361,10 @@
</view>
</view>
</block>
<view class="relative bbs-1-eb last-b-none pl180 font-28">
<view class="absolute left-0 box-middle color-333">双方约定</view>
<view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">{{sa}}</view>
</view>
</block>
<view class="fixed left-0 right-0 bottom-0 bg-fff-op90 inner40 fn-flex safe-pb">
<button class="wp100 bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" hover-class="btn-36afa2-hover" bindtap="optPreview">重新编辑</button>
pages/order/register/index.js
+5
View File
@@ -100,6 +100,8 @@ Page({
oncardArray:[],//上牌城市
oncardIndex:-1,//上牌城市索引
sa:'',//双方约定
},
//生命周期函数--监听页面加载
onLoad: function (options) {
@@ -685,6 +687,9 @@ Page({
if(!!that.data.priceinfo.sdisc_money && that.data.priceinfo.sdisc_money != '' ){
params['disc_money'] = that.data.priceinfo.sdisc_money;
}
if(that.data.sa != ''){
params['sa'] = that.data.sa;
}
let srv_arr = []
that.data.agencyList.forEach(item => {
if(item.checked){
pages/order/register/index.wxml
+6
View File
@@ -320,6 +320,8 @@
<view class="mb20 inner20 bds-2-36afa2 text-center font-28 color-36afa2 ulib-r10" bindtap="addFine"><i class="iconfont mr10 font-24 icon-jia1"></i>添加</view>
</view>
</view>
<view class="relative pt30 font-28 color-333">双方约定</view>
<textarea class="wp100 mt20 inner20 line-height-16 bg-f6 font-28 ulib-r10" style="height:180rpx;" placeholder-class="color-ccc" placeholder="请填写双方约定" model:value='{{sa}}' />
</block>
</view>
@@ -508,6 +510,10 @@
</view>
</view>
</block>
<view class="relative bbs-1-eb last-b-none pl180 font-28">
<view class="absolute left-0 box-middle color-333">双方约定</view>
<view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">{{sa}}</view>
</view>
</block>
<view class="fixed left-0 right-0 bottom-0 bg-fff-op90 inner40 fn-flex safe-pb">
<button class="wp100 bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" hover-class="btn-36afa2-hover" bindtap="optPreview">重新编辑</button>