修改小程序新增客户池

app.json

@@ -71,11 +71,7 @@
     "pages/clues/index",
     "pages/clues/detail/index",
     "pages/score/index",
-    "pages/score/detail",
+    "pages/score/detail"
-    "pages/customer/score/index",
-    "pages/customer/exchange/index",
-    "pages/customer/score/recharge",
-    "pages/customer/score/exchange"
   ],
   "permission": {
     "scope.userLocation": {

commons/css/base/fontColor.wxss

@@ -14,5 +14,4 @@
 .color-fe4109{color:#fe4109;}
 .color-36afa2{color:#36afa2;}
 .color-00c800{color:#00c800;}
-.color-575b6a{color:#575b6a;}
+.color-575b6a{color:#575b6a;}
-.color-ff0000{color:#ff0000;}

commons/css/base/textRender.wxss

@@ -11,5 +11,4 @@
 .text-shadow{text-shadow:1rpx 3rpx 3rpx rgba(0,0,0,.8);}
 .text-spacing-10{letter-spacing:10rpx}
 .space-nowrap{white-space:nowrap;}
-.space-normal{white-space:normal;}
+.space-normal{white-space:normal;}
-.text-italic{font-style: italic;}

commons/css/common.wxss

@@ -11,4 +11,3 @@
 @import "base/padding.wxss";
 @import "base/radius.wxss";
 @import "base/animate.wxss";
-@import "custom/customIcon.wxss";

commons/css/custom/customIcon.wxss

@@ -1,22 +0,0 @@
-
-.custom-icon{
-    background-size: 100% 100%;
-    background-repeat: no-repeat;
-    background-position: center;
-    display: inline-block;
-} 
-.custom-icon-filtersearch{
-    width: 32rpx;
-    height: 32rpx;
-    background-image: url('https://img.liche.cn/lichebao/icon-filtersearch.png');
-}
-.custom-icon-logout{
-    width: 32rpx;
-    height: 32rpx;
-    background-image: url('https://img.liche.cn/lichebao/icon-logout.png');
-}
-.custom-icon-scancode{
-    width: 24rpx;
-    height: 24rpx;
-    background-image: url('https://img.liche.cn/lichebao/icon-scancode.png');
-}

commons/js/config.js

@@ -1,5 +1,4 @@
-const envVersion = wx.getAccountInfoSync().miniProgram.envVersion;
+const env = "p";
-const env = envVersion === "release" || envVersion === "trial" ? "p" : "d";
 
 const version = 1,
 
@@ -26,7 +25,6 @@ api = {
   upImg: baseUrl + "upimg", //上传图片
   appUserUkey: "app/user/ukey", //登录/退出登录
   appUser: "app/user", //用户信息
-  appUserMenu: "app/user/menu", //用户菜单
   appSms: "app/sms", //获取验证码
   appUserTel: "app/user/tel", //获取用户手机号
   appSeriesAttrs: "app/series/attrs", //获取车型属性
@@ -37,7 +35,6 @@ api = {
   appSmsCusorder: "app/sms/cusorder", //订单发短信
   appCustomerlogs: "app/customerlogs", //获取日志
   appCustomerData: "app/customers/data", //获取客户详细信息
-  appCustomerLock: "app/customers/unlock", //解锁线索
   appCusorder: "app/cusorder", //新建订单 /获取订单列表 /获取订单详情 /修改付款方式 /修改委托协议
   appCusorderTabs: "app/cusorder/tabs", //获取tab
   appEmployees: "app/employees", //获取客户详细信息 /获取店员列表 /更新店员信息 /删除店员 
@@ -50,7 +47,6 @@ api = {
   appYx: "app/yx", //获取云信虚拟电话
   appCustomerlogs: "app/customerlogs", //新增日志
   appCustomerData: "app/customers/data", //修改客户基本信息
-  appCustomerUnlockReason: "app/customers/lockReason", //获取不解锁原因
   appServicesPackage: "app/services/package", //获取代办包
   appSeriesInfo: "app/series/info", //获取车辆价格
   appBusiness: "app/business", //获取商务政策
@@ -124,7 +120,6 @@ api = {
   appBizSituation_tabs: 'app/biz/situation_tabs', //店铺概况_tab
   appBizSituation: 'app/biz/situation', //店铺概况 /店铺概况保存
   appBizStreet: 'app/biz/street', //获取乡镇
-  appBizAccountLogs: 'app/bizAccountLog/lists', //获取店铺充值日志
 
   appCusorderV2Inten: 'app/cusorderV2/inten', //新增意向金订单
   appCusorderV2: 'app/cusorderV2', //新建订单 /获取订单列表 /订单详情 /修改订单信息
@@ -183,7 +178,6 @@ api = {
 
   appClues: "app/clues", //获取线索列表 获取线索详情
   appCluesLogs: "app/clueslogs", //线索日志
-  appCluesLock: "app/clues/unlock", //解锁线索
 
   appSignConf: "app/sign/conf", //签到配置信息
   appUserConf: "app/sign/userConf", //用户签到配置信息
@@ -197,7 +191,6 @@ api = {
   appRadar: "app/score/radar", //雷达图数据
 
   appPaic: "app/paic", //平安用户
-  appCusorderDestroy: 'app/cusorderDestroy', //核销优惠券
 }
 
 //远程图片存储地址
@@ -262,4 +255,4 @@ export default {
   subscribeTmpId,
   white401UrlList,
   v2OrderId,
-}
+}

commons/js/utils/apiQuery.js

@@ -1094,45 +1094,4 @@ apiQuery.appPaic = function(params){
   })
 }
 
-//获取用户中心菜单
-apiQuery.getUserMenu = function(params){
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appUserMenu, 2, params, "GET", resolve, reject)
-  })
-}
-//解锁线索
-apiQuery.putAppCluesLock = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.appCluesLock, 2, params, "PUT", resolve, reject)
-  })
-}
-//店铺充值记录
-apiQuery.getBizAccountLogs = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appBizAccountLogs, 2, params, "GET", resolve, reject)
-  })
-}
-//核销优惠券
-apiQuery.postAppCusorderDestroy = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appCusorderDestroy, 2, params, "POST", resolve, reject)
-  })
-}
-//优惠券记录
-apiQuery.getAppCusorderDestroy = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appCusorderDestroy, 2, params, "GET", resolve, reject)
-  })
-}
-//解锁客户
-apiQuery.putAppCustomerLock = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.appCustomerLock, 2, params, "PUT", resolve, reject)
-  })
-}
-apiQuery.getAppCustomerUnlockReason = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appCustomerUnlockReason, 2, params, "GET", resolve, reject)
-  })
-}
 export default apiQuery;

pages/channel/index.wxml

@@ -7,7 +7,7 @@
           <lcb-auth type="userinfo" isShowProfile="{{isShowProfile}}" bind:onSuccess="getUserInfo"></lcb-auth>
         </view>
         <view>
-          <view class="font-22 color-fff">Hi~ {{hoursTip}}欢迎回到理车宝！</view>
+          <view class="font-22 color-fff">Hi~ {{hoursTip}}欢迎回到车卖场AHOH！</view>
           <view>
             <text class="text-middle text-bold font-48 color-fff">{{userInfo.uname}}</text>
           </view>

pages/clues/detail/index.js

@@ -26,6 +26,7 @@ Page({
         [key]: options[key]
       })
     }
+
     this.getAppCluesDetails()
     this.getAppCluesLogs()
     innerAudioContext.onEnded(() => {

pages/clues/detail/index.wxml

@@ -81,8 +81,8 @@
   </view>
   <view class="fixed left-0 bottom-0 right-0 bg-fff-op90 pl40 pr40 pt20 pb40 z-index-1">
     <view class="fn-flex text-center fn-flex-between">
-      <view class="fn-flex-item flexsize4 pt20 pb20 btn-36afa2 font-32 color-fff ulib-r750" bindtap="pushLink" data-url="{{ from=='customer' ? '/pages/customer/index':'/pages/clues/index'}}">返回列表</view>
+      <view class="fn-flex-item flexsize4 pt20 pb20 btn-36afa2 font-32 color-fff ulib-r750" bindtap="pushLink" data-url="/pages/clues/index">返回列表</view>
     </view>
   </view>
 </view>
-<lcb-backChannel></lcb-backChannel>
+<lcb-backChannel></lcb-backChannel>

pages/customer/exchange/index.js

@@ -1,66 +0,0 @@
-// pages/customer/exchange/index.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/customer/exchange/index.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/customer/exchange/index.wxml

@@ -1,2 +0,0 @@
-<!--pages/customer/exchange/index.wxml-->
-<text>pages/customer/exchange/index.wxml</text>

pages/customer/exchange/index.wxss

@@ -1 +0,0 @@
-/* pages/customer/exchange/index.wxss */

pages/customer/index.wxml

@@ -1,27 +1,9 @@
-<!--
-<wxs module="tool">
-  var formatTime = function(time) {
-    // 总秒数
-    var totalSecond = Math.floor(time);
-    //天
-    var day = Math.floor(totalSecond / 3600 / 24);
-    // 小时
-    var hour = Math.floor(totalSecond / 3600);
-    // 分钟
-    var minute = Math.floor(totalSecond / 60) % 60;
-    // 秒
-    var second = totalSecond % 60;
-    return day + '天' + hour + '小时' + minute + '分' + second + '秒';
-  }
-  exports.formatTime = formatTime;
-</wxs>
--->
 <view class="container">
 
   <view>
     <view style="padding-top:110rpx"></view>
     <view class="fixed top-0 left-0 right-0 bg-fff z-index-1">
-      <view class="fn-flex mt5 pl20 pr20 font-32 color-666 text-center" wx:if="{{0&&tab.length<5}}">
+      <view class="fn-flex mt5 pl20 pr20 font-32 color-666 text-center" wx:if="{{tab.length<5}}">
         <block wx:for='{{tab}}' wx:key='list'>
           <view class="fn-flex-item pl20 pr20 tabmenu2 {{key == item.key?'active color-36afa2':''}}" data-index="{{index}}" bindtap="changeTab">
             <view class="relative">{{item.name}}</view>
@@ -41,19 +23,18 @@
   <view class="pl40 pb15 fn-clear">
     <view class="fn-fl">
       <text class="text-middle">共<text class="color-f9394d">{{total}}</text>条</text>
-      <block wx:if="{{ key!= cluesTabKey}}">
+      <text class="ml20 text-middle font-22"> 排序：</text>
-        <text class="ml20 text-middle font-22"> 排序：</text>
+      <picker class="inline-block text-middle bg-f6 color-666 pt5 pb5 pl15 pr10 ulib-r750 font-22" bindchange="changeSortList" value="{{sortListIndex}}" range="{{sortList}}">
-        <picker class="inline-block text-middle bg-f6 color-666 pt5 pb5 pl15 pr10 ulib-r750 font-22" bindchange="changeSortList" value="{{sortListIndex}}" range="{{sortList}}">
+        <text>{{sortList[sortListIndex]}}</text>
-          <text>{{sortList[sortListIndex]}}</text>
+        <i class="iconfont ml5 icon-gengduo"></i>
-          <i class="iconfont ml5 icon-gengduo"></i>
+      </picker>
-        </picker>
-      </block>
     </view>
-    <view class="fn-fr {{key<2?'pr180':'pr40'}} relative" wx:if="{{ key!= cluesTabKey}}">
+    <view class="fn-fr {{key<2?'pr180':'pr40'}} relative">
       <text bindtap="showfilter" class="inner5 iconfont icon-gaojisousuo ml10"></text>
       <view bindtap="pushLink" data-url="/pages/customer/addCard/index?status={{key}}" class="absolute right-0 box-middle pt10 pb10 pl10 pr30 space-nowrap bg-333 font-22 color-fff ulib-rl750" wx:if="{{key<2}}"><i class="iconfont mr5 icon-jia"></i>客户建卡</view>
     </view>
   </view>
+
   <view class="pl20 pr20 fn-flex fn-flex-wrap">
     <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{cus_id}}">{{cus_id}}</view>
     <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{name}}">{{name}}</view>
@@ -84,115 +65,54 @@
   </view>
 
   <view class="mt10 pl30 pr30">
-    <block wx:if="{{key===cluesTabKey}}">
+    <block wx:for='{{list}}' wx:key='index'>
-      <block wx:for='{{list}}' wx:key='index'>
+      <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/customer/detail/index?id={{item.id}}">
-        <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bind:tap="goClues" data-row="{{ item }}">
+        <view class="absolute top-0 left-0 ml40 bg-36afa2 font-22 color-fff" wx:if="{{item.defeat||item.orders_pay}}">
-          <view class="relative pr180">
+          <text class="pl10 pr10" wx:if="{{item.defeat}}">{{item.defeat}}</text>
-            <view class="font-32">
+          <text class="pl10 pr10 {{item.defeat&&item.orders_pay?'bls-1-eb':''}}" wx:if="{{item.orders_pay}}">{{item.orders_pay}}</text>
-              <text class="text-middle">{{item.name}}</text>
-              <text class="text-middle font-26 color-666">({{item.mobile}})</text>
-            </view>
-            <!--
-            <view class="absolute right-0 top-0" wx:if="{{item.un_lock==0}}">
-              <view class="font-26 mt10" style="color:#f63c51">{{'距转派还剩'+item.left_time}}</view>
-            </view>
-            -->
-          </view>
-          <view class="relative">
-            <view class="mt25 fn-clear font-28 pr180">
-              <view class="fn-fl color-333 mr15">入池时间</view>
-              <view class="fn-fl color-666">{{ item.other_data['建档时间'] }}</view>
-            </view>
-            <view class="mt25 fn-clear font-28 pr180">
-              <view class="fn-fl color-333 mr15">意向车型</view>
-              <view class="fn-fl color-666">{{item.other_data['关注车型']}}</view>
-            </view>
-            <!--
-            <view class="absolute right-0 box-middle" wx:if="{{!item.un_lock}}" bind:tap="showUnlock" data-id="{{item.id}}">
-              <button class="btn color-fff font-26 ulib-r750" style="background-color:#f63c51"><text class="iconfont icon-xiaoji mr5"></text>解锁查看</button>
-            </view>
-            -->
-            <view class="mt25 fn-clear">
-              <view class="fn-fl wp50 pl25 pl25 pr25" wx:if="{{!item.un_lock}}" bind:tap="showNotlock" data-id="{{item.id}}">
-                <button class="btn color-fff font-26 ulib-r750 btn-36afa2"><text class="iconfont icon-xiaoji mr5"></text>不解锁</button>
-              </view>
-              <view class="fn-fl wp50 pl25 pr25" wx:if="{{!item.un_lock}}" bind:tap="showUnlock" data-id="{{item.id}}">
-                <button class="btn color-fff font-26 ulib-r750" style="background-color:#f63c51"><text class="iconfont icon-xiaoji mr5"></text>解锁查看</button>
-              </view>
-            </view>
-          </view>
-          <view class="relative mt20 overflowhidden">
-            <view class="orderDtail-log mt40 relative" wx:if="{{item.logList.length>0}}">
-              <block wx:for="{{item.logList}}" wx:for-item="log" wx:for-index="index" wx:key="index">
-                <view class="orderDtail-log-item pl40 relative">
-                  <view class="orderDtail-log-content">
-                    <!-- 时间 -->
-                    <view class="font-22">
-                      <text class="color-999">{{log.c_time}}</text>
-                    </view>
-                    <!-- 内容 -->
-                    <view class="font-28 text-break" style="min-height:50rpx;">{{log.content}}</view>
-                  </view>
-                  <i class="absolute box-middle mt15 bg-fff line-height-11 font-22 color-999 iconfont icon-jiantou-up z-index-1" wx:if="{{index+1 != item.logList.length}}"></i>
-                  <text class="absolute orderDtail-log-line2 z-index-0" wx:if="{{index != item.logList.length-1}}"></text>
-                  <text class="absolute orderDtail-log-dot z-index-1"></text>
-                </view>
-              </block>
-            </view>
-          </view>
         </view>
-      </block>
+        <view class="relative pr180">
-    </block>
+          <view class="font-32">
-    <block wx:else>
+            <text class="text-middle">{{item.name}}</text>
-      <block wx:for='{{list}}' wx:key='index'>
+            <text class="text-middle font-26 color-666">({{item.mobile}})</text>
-        <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/customer/detail/index?id={{item.id}}">
+            <text class="text-middle iconfont icon-weixin1 ml10 color-00c800" wx:if="{{item.is_weChat}}"></text>
-          <view class="absolute top-0 left-0 ml40 bg-36afa2 font-22 color-fff" wx:if="{{item.defeat||item.orders_pay}}">
+            <text class="text-middle iconfont icon-xingxing ml10 {{item.is_top==1?'color-f9394d':'color-ccc'}}" catchtap="optTop" data-index="{{index}}"></text>
-            <text class="pl10 pr10" wx:if="{{item.defeat}}">{{item.defeat}}</text>
-            <text class="pl10 pr10 {{item.defeat&&item.orders_pay?'bls-1-eb':''}}" wx:if="{{item.orders_pay}}">{{item.orders_pay}}</text>
           </view>
-          <view class="relative pr180">
+          <view class="text-nowrap">
-            <view class="font-32">
+            <text class="mr15 font-22 color-666">编号 {{item.cid}}</text>
-              <text class="text-middle">{{item.name}}</text>
+            <block wx:for="{{item.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
-              <text class="text-middle font-26 color-666">({{item.mobile}})</text>
+              <text class="inline-block mr10 pl10 pr10 bg-666 font-18 color-fff ulib-r750" wx:if="{{i<4}}">{{tag}}</text>
-              <text class="text-middle iconfont icon-weixin1 ml10 color-00c800" wx:if="{{item.is_weChat}}"></text>
+            </block>
-              <text class="text-middle iconfont icon-xingxing ml10 {{item.is_top==1?'color-f9394d':'color-ccc'}}" catchtap="optTop" data-index="{{index}}"></text>
+            <block wx:if="{{item.tags.length>4}}">
-            </view>
+              ...
-            <view class="text-nowrap">
+            </block>
-              <text class="mr15 font-22 color-666">编号 {{item.cid}}</text>
+          </view>
-              <block wx:for="{{item.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
+          <view class="absolute right-0 box-middle">
-                <text class="inline-block mr10 pl10 pr10 bg-666 font-18 color-fff ulib-r750" wx:if="{{i<4}}">{{tag}}</text>
+            <!--view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{item.id}}">
-              </block>
-              <block wx:if="{{item.tags.length>4}}">
-                ...
-              </block>
-            </view>
-            <view class="absolute right-0 box-middle">
-              <!--view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{item.id}}">
               <i class="absolute box-center-middle iconfont icon-duanxinguanli"></i>
             </view-->
-              <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{item.id}}">
+            <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{item.id}}">
-                <i class="absolute box-center-middle iconfont icon-dianhua"></i>
+              <i class="absolute box-center-middle iconfont icon-dianhua"></i>
-              </view>
             </view>
           </view>
-
-          <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
-            <view class="mt25 fn-clear font-28">
-              <view class="fn-fl color-333">{{key}}</view>
-              <block wx:if="{{key=='车管家'}}">
-                <view class="fn-fr wp60 text-nowrap text-right">
-                  <text class="text-middle color-666" wx:if="{{value}}">{{value}}</text>
-                  <text class="text-middle color-f9394d" wx:else>待分配</text>
-                  <text class="inline-block ml10 bg-36afa2 pt5 pb5 pl15 pr15 text-middle font-22 color-fff ulib-r10" catchtap="optEmployees" data-cid="{{item.id}}" data-level="{{item.level}}" wx:if="{{item.allot == 1}}">{{value?'重新分配':'分配'}}</text>
-                </view>
-              </block>
-              <view wx:else class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
-            </view>
-          </block>
         </view>
-      </block>
-    </block>
 
+        <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
+          <view class="mt25 fn-clear font-28">
+            <view class="fn-fl color-333">{{key}}</view>
+            <block wx:if="{{key=='车管家'}}">
+              <view class="fn-fr wp60 text-nowrap text-right">
+                <text class="text-middle color-666" wx:if="{{value}}">{{value}}</text>
+                <text class="text-middle color-f9394d" wx:else>待分配</text>
+                <text class="inline-block ml10 bg-36afa2 pt5 pb5 pl15 pr15 text-middle font-22 color-fff ulib-r10" catchtap="optEmployees" data-cid="{{item.id}}" data-level="{{item.level}}" wx:if="{{item.allot == 1}}">{{value?'重新分配':'分配'}}</text>
+              </view>
+            </block>
+            <view wx:else class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
+          </view>
+        </block>
+
+      </view>
+    </block>
     <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>
   </view>
 
@@ -549,50 +469,4 @@
     </view>
   </view>
 </lcb-msg>
-
-<!-- 确认解锁线索 -->
-<lcb-msg isShow="{{isShowLock}}" isCustomTabBar="{{true}}">
-  <view slot="content">
-    <view class="pt50 pb40">
-      <view class="font-36 text-center">确认解锁线索</view>
-      <view class="mt10 font-28 text-center color-666">解锁后，视为接受<text style="color:#184ebb;">《合作条款》</text></view>
-    </view>
-    <view class="text-center font-24 color-aaa pb30">
-      <text class="iconfont icon-checkbox-selected-fill"></text><text>不再提醒</text>
-    </view>
-    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="hideLock" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
-        取消
-      </button>
-      <button bindtap="bindLock" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">
-        确定
-      </button>
-    </view>
-  </view>
-</lcb-msg>
-<!-- 确认不解锁线索 -->
-<lcb-msg isShow="{{isShowNotLock}}" isCustomTabBar="{{true}}">
-  <view slot="content">
-    <view class="pt50">
-      <view class="font-36 text-center">确认不解锁线索</view>
-    </view>
-    <view class="mt20 bds-2-eb ml40 mr40 inner20 font-28 color-666 fn-clear ulib-r10">
-      <view class="fn-fl">选择理由</view>
-      <picker class="fn-fr wp60 text-right" bindchange="changeReason" value="{{reasonIndex}}" range="{{reasonList}}">
-        <text class="color-ccc" wx:if="{{reasonIndex == -1}}">请选择</text>
-        <text wx:else>{{reasonList[reasonIndex]}}</text>
-        <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-      </picker>
-    </view>
-    <view class="fn-flex mt20 pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="hideNotlock" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
-        取消
-      </button>
-      <button bindtap="bindLock"  data-unlock="true" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">
-        确定
-      </button>
-    </view>
-  </view>
-</lcb-msg>
-
 <brandSelect show="{{brand_page_show}}" bindleave="getBrandData"></brandSelect>

pages/customer/index.wxss

@@ -25,68 +25,4 @@
   to {right:-650rpx;}
 }
 
-.radio-btn{min-width:104rpx;box-sizing:border-box;text-align:center;}
+.radio-btn{min-width:104rpx;box-sizing:border-box;text-align:center;}
-
-.orderDtail-log-item{
-  padding-bottom: 40rpx;
-  line-height: 1.6;
-}
-.orderDtail-log-item:first-child{
-  margin-top: 0;
-}
-.orderDtail-log-line{
-  top: 8rpx;
-  left:16rpx;
-  width:2rpx;
-  height:2rpx;
-}
-.orderDtail-log-line::before{
-  content:'';
-  position:absolute;
-  left:0;
-  bottom:8rpx;
-  background-color: #1a1a1a;
-  width:2rpx;
-  height:1000rpx;
-}
-.orderDtail-log-line2{
-  top:8rpx;
-  bottom:-8rpx;
-  left:16rpx;
-  width:2rpx;
-  background-color: #1a1a1a;
-}
-.orderDtail-log-dot{
-  top: 8rpx;
-  left:6rpx;
-  width: 23rpx;
-  height: 23rpx;
-  border-radius: 100%;
-  background-color: #fff;
-}
-.orderDtail-log-dot::before{
-  width: 18rpx;
-  height: 18rpx;
-  background-color: #fff;
-}
-.orderDtail-log-dot::after{
-  width: 12rpx;
-  height: 12rpx;
-  background-color: #1a1a1a;
-}
-.orderDtail-log-dot::before,.orderDtail-log-dot::after{
-  content: '';
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%,-50%);
-  border-radius: 100%;
-}
-
-.orderDtail-log .orderDtail-log-content{
-  position:relative;
-  top:-20rpx;
-}
-.icon-jiantou-up{
-  left:6rpx;
-}

pages/customer/score/exchange.js

@@ -1,165 +0,0 @@
-// pages/customer/score/exchange.js 20250624
-import _ from '../../../commons/js/commons'
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    startDate: '',
-    endDate: '',
-    list: [],
-    loading: true,
-    end: false,
-    noData: false,
-    pageNo: 1,
-    size: 20
-  },
-
-  /**
-   * 开始日期选择
-   */
-  onStartDateChange(e) {
-    this.setData({
-      startDate: e.detail.value
-    });
-  },
-
-  /**
-   * 结束日期选择
-   */
-  onEndDateChange(e) {
-    this.setData({
-      endDate: e.detail.value
-    });
-  },
-
-  /**
-   * 搜索按钮点击
-   */
-  onSearch() {
-    console.log('搜索', this.data.startDate, this.data.endDate);
-    // 这里可以添加搜索逻辑
-    this.setData({
-      pageNo: 1,
-      list: [],
-      noData: false,
-      end: false,
-      load: true,
-      loading: false
-    })
-    this.getAppCusorderDestroy();
-  },
-
-  /**
-   * 查看订单详情
-   */
-  viewOrderDetail(e) {
-    const orderId = e.currentTarget.dataset.id;
-    console.log('查看订单详情', orderId);
-    // 这里可以跳转到订单详情页面
-  },
-
-  /**
-   * 查看优惠券使用规则
-   */
-  viewCouponRules() {
-    console.log('查看优惠券使用规则');
-    // 这里可以显示优惠券使用规则弹窗
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    this.getAppCusorderDestroy();
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {},
-  getAppCusorderDestroy() {
-    this.setData({
-      load: false,
-      loading: true,
-    })
-
-    let params = {};
-    params['page'] = this.data.pageNo;
-    params['size'] = this.data.size;
-    if (this.data.startDate) {
-      params['startDate'] = this.data.startDate;
-    }
-    if (this.data.endDate) {
-      params['endDate'] = this.data.endDate;
-    }
-    _.apiQuery.getAppCusorderDestroy(params).then(res => {
-      this.setData({
-        total: res.data.total,
-        pageNo: this.data.pageNo + 1,
-        list: this.data.list.concat(res.data.list),
-        load: true,
-        loading: false,
-      })
-      if (res.data.total == 0) {
-        this.setData({
-          noData: true
-        })
-      } else if (this.data.list.length == res.data.total) {
-        this.setData({
-          end: true
-        })
-      }
-      wx.stopPullDownRefresh()
-    });
-  },
-  //推送链接
-  pushLink(e) {
-    if (e.currentTarget.dataset.url) {
-      _.$router.openUrlScheme(e.currentTarget.dataset.url)
-    }
-  },
-})

pages/customer/score/exchange.json

@@ -1,8 +0,0 @@
-{
-  "navigationBarTitleText": "核销记录",
-  "navigationBarTextStyle": "white",
-  "navigationBarBackgroundColor": "#1a1c26",
-  "backgroundColor": "#ffffff",
-  "backgroundColorTop": "#1a1c26",
-  "usingComponents": {}
-}

pages/customer/score/exchange.wxml

@@ -1,80 +0,0 @@
-<!--pages/customer/score/exchange.wxml 20250624 -->
-<view class="container">
-
-  <!-- 日期选择区域 -->
-  <view class="date-section">
-    <view class="date-picker">
-      <picker mode="date" value="{{startDate}}" bindchange="onStartDateChange">
-        <view class="date-input bg-f8 ulib-r750 font-24">
-          <text class="date-icon font-20 mr5" style="filter: grayscale(100%);">📅</text>
-          <text class="date-text">{{startDate || '请选择开始时间'}}</text>
-        </view>
-      </picker>
-      <text class="date-separator">-</text>
-      <picker mode="date" value="{{endDate}}" bindchange="onEndDateChange">
-        <view class="date-input bg-f8 ulib-r750 font-24">
-          <text class="date-icon font-20 mr5" style="filter: grayscale(100%);">📅</text>
-          <text class="date-text">{{endDate || '请选择结束时间'}}</text>
-        </view>
-      </picker>
-    </view>
-    <view class="btn bg-36afa2 color-fff font-26 ulib-r750 pl40 pr40 pt10 pb10" bindtap="onSearch">
-      <text>搜索</text>
-    </view>
-  </view>
-
-  <!-- 订单列表 -->
-  <view class="order-list">
-    <view class="order-item" wx:for="{{list}}" wx:key="id">
-      <!-- 订单编号和详情按钮 -->
-      <view class="order-header font-26 color-36afa2 pt20 pb20 pl30 pr30" bindtap="pushLink" data-url="/pages/order/detail/index2?id={{item.order_id}}">
-        <text class="order-number">订单编号 {{item.order_sid}}</text>
-        <view class="order-detail-btn" bindtap="viewOrderDetail" data-id="{{item.order_id}}">
-          <text>订单详情 ></text>
-        </view>
-      </view>
-      <view class="inner30">
-        <!-- 客户信息 -->
-        <view class="customer-info">
-          <text class="customer-name">{{item.name}}</text>
-          <text class="customer-phone">({{item.mobile}})</text>
-          <view class="points-info" wx:if="{{item.points}}">
-            <text class="points-label">消耗积分:</text>
-            <text class="points-value">{{item.points}}</text>
-          </view>
-        </view>
-
-        <!-- 优惠券信息 -->
-        <view class="coupon-card">
-          <view class="coupon-left text-center">
-            <view >
-              <text class="coupon-amount">{{item.price}}</text>
-              <text class="coupon-unit">元</text>
-            </view>
-            <view class="coupon-rules mt10 font-22" bindtap="viewCouponRules">
-              <text>使用规则 ></text>
-            </view>
-          </view>
-          <view class="coupon-divider"></view>
-          <view class="coupon-right">
-            <text class="coupon-title text-italic text-bold">
-            <text>{{item.type_cn}}</text><text style="color:#f84803;">{{item.red_type_cn}}</text></text>
-            <text class="coupon-validity font-22">时限 {{item.timeStart}}-{{item.timeEnd}}</text>
-          </view>
-        </view>
-
-        <!-- 下单时间 -->
-        <view class="order-time font-24 color-666">
-          <text>核销时间: {{item.use_time}}</text>
-        </view>
-      </view>
-
-    </view>
-    <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>
-  </view>
-
-  <!-- 空状态 -->
-  <view class="empty-state" wx:if="{{orderList.length === 0}}">
-    <text>暂无核销记录</text>
-  </view>
-</view>

pages/customer/score/exchange.wxss

@@ -1,257 +0,0 @@
-/* pages/customer/score/exchange.wxss */
-
-.container {
-  min-height: 100vh;
-  background-color: #f5f5f5;
-}
-
-/* 顶部导航栏 */
-.header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 10px 15px;
-  background-color: #fff;
-  border-bottom: 1px solid #eee;
-}
-
-.back-btn {
-  width: 40px;
-  height: 40px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.back-btn .icon-back {
-  font-size: 24px;
-  color: #333;
-}
-
-.title {
-  font-size: 18px;
-  font-weight: 500;
-  color: #333;
-}
-
-.menu-btn {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-}
-
-.dots {
-  font-size: 20px;
-  color: #666;
-}
-
-.record-btn {
-  width: 30px;
-  height: 30px;
-  background-color: #666;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 16px;
-}
-
-/* 日期选择区域 */
-.date-section {
-  display: flex;
-  align-items: center;
-  padding: 15px;
-  background-color: #fff;
-  margin-bottom: 10px;
-  gap: 15px;
-}
-
-.date-picker {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  gap: 5px;
-}
-
-.date-input {
-  display: flex;
-  align-items: center;
-  /* gap: 5px; */
-  padding: 10rpx 15rpx;
-  /* border: 1px solid #ddd; */
-  /* border-radius: 4px; */
-  /* background-color: #fff; */
-  width: 210rpx;
-}
-
-.date-icon {
-  /* font-size: 16px; */
-}
-
-.date-text {
-  /* font-size: 14px; */
-  color: #333;
-}
-
-.date-separator {
-  font-size: 16px;
-  color: #666;
-}
-
-.search-btn {
-  padding: 8px 20px;
-  background-color: #4CAF50;
-  color: white;
-  border-radius: 20px;
-  font-size: 14px;
-}
-
-/* 订单列表 */
-.order-list {
-  padding: 0 15px;
-}
-
-.order-item {
-  background-color: #fff;
-  border-radius: 16rpx;
-  margin-bottom: 30rpx;
-  /* padding: 15px; */
-  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-}
-
-/* 订单头部 */
-.order-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #ebf7f5;
-  overflow: hidden;
-}
-
-.order-number {
-  /* font-size: 28rpx; */
-}
-
-.order-detail-btn {
-  /* color: #4CAF50;
-  font-size: 14px; */
-}
-
-/* 客户信息 */
-.customer-info {
-  display: flex;
-  align-items: center;
-  margin-bottom: 15px;
-  gap: 10px;
-}
-
-.customer-name {
-  font-size: 16px;
-  font-weight: 500;
-  color: #333;
-}
-
-.customer-phone {
-  font-size: 14px;
-  color: #666;
-}
-
-.points-info {
-  margin-left: auto;
-  display: flex;
-  align-items: center;
-  gap: 5px;
-}
-
-.points-label {
-  font-size: 14px;
-  color: #666;
-}
-
-.points-value {
-  font-size: 14px;
-  color: #ff4444;
-  font-weight: 500;
-}
-
-/* 优惠券卡片 */
-.coupon-card {
-  display: flex;
-  background-image: url('https://img.liche.cn/lichebao/coupon-red.png');
-  width: 650rpx;
-  height: 174rpx;
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  /* background: linear-gradient(135deg, #ffebee 0%, #fff 100%); */
-  /* border-radius: 8px;
-  overflow: hidden; */
-  margin-bottom: 15px;
-  position: relative;
-}
-
-.coupon-left {
-  /* padding: 20px; */
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  min-width: 120px;
-  /* background-color: #ffebee; */
-}
-
-.coupon-amount {
-  font-size: 50rpx;
-  font-weight: bold;
-  color: #ff4444;
-  line-height: 1;
-}
-
-.coupon-unit {
-  font-size: 16px;
-  color: #ff4444;
-  margin-bottom: 10px;
-}
-
-.coupon-rules {
-  color: #ae5151;
-}
-
-.coupon-divider {
-  width: 2px;
-  /* background: repeating-linear-gradient(
-    to bottom,
-    transparent 0px,
-    transparent 5px,
-    #ddd 5px,
-    #ddd 10px
-  ); */
-  position: relative;
-}
-
-
-.coupon-right {
-  flex: 1;
-  padding: 20px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-
-.coupon-title {
-  font-size: 18px;
-  color: #333;
-  margin-bottom: 15rpx;
-}
-
-.coupon-validity {
-  color: #ae5151;
-}
-
-
-/* 空状态 */
-.empty-state {
-  text-align: center;
-  padding: 50px 20px;
-  color: #999;
-  font-size: 14px;
-}

pages/customer/score/index.js

@@ -1,173 +0,0 @@
-// pages/customer/score/index.js 20250624
-import _ from '../../../commons/js/commons'
-const app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    imgUrl: _.config.imgUrl,
-    cur_month: '',
-    cur_tab_index: 0,
-    tab_list: [{
-        name: '全部',
-        id: 0
-      },
-      {
-        name: '充值',
-        id: 1
-      },
-      {
-        name: '消耗',
-        id: 2
-      }
-    ],
-    pageNo: 1,
-    list: [],
-    loading: true,
-    end: false,
-    noData: false,
-    sumRechangeMoney: 0,
-    sumUseMoney: 0,
-    leftMoney: 0,
-    size: 20
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    this.getBizAccountLog();
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-    this.setData({
-      pageNo: 1,
-      list: [],
-      noData: false,
-      end: false,
-      load: true,
-      loading: false
-    })
-    this.getBizAccountLog();
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-    if (this.data.noData || this.data.end || !this.data.load) return;
-    this.getBizAccountLog()
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  },
-
-  bindDateChange(e) {
-    this.setData({
-      cur_month: e.detail.value,
-      pageNo: 1,
-      list: [],
-      noData: false,
-      end: false,
-      load: true,
-      loading: false
-    })
-    this.getBizAccountLog();
-  },
-  //切换tab
-  changeTab(e) {
-    this.setData({
-      cur_tab_index: e.currentTarget.dataset.index,
-      pageNo: 1,
-      list: [],
-      noData: false,
-      end: false,
-      load: true,
-      loading: false
-    })
-    this.getBizAccountLog();
-  },
-  //推送链接
-  pushLink(e) {
-    if (e.currentTarget.dataset.url) {
-      _.$router.openUrlScheme(e.currentTarget.dataset.url)
-    }
-  },
-  getBizAccountLog() {
-    this.setData({
-      load: false,
-      loading: true,
-    })
-
-    let params = {};
-    params['page'] = this.data.pageNo;
-    params['size'] = this.data.size;
-    params['type'] = this.data.tab_list[this.data.cur_tab_index]['id']
-    if (this.data.cur_month) {
-      params['month'] = this.data.cur_month
-    }
-    _.apiQuery.getBizAccountLogs(params).then(res => {
-      if (this.data.pageNo == 1) {
-        this.setData({
-          sumRechangeMoney: res.data.sumRecharge,
-          sumUseMoney: res.data.sumUseMoney,
-          leftMoney:res.data.leftMoney
-        })
-      }
-      this.setData({
-        total: res.data.total,
-        pageNo: this.data.pageNo + 1,
-        list: this.data.list.concat(res.data.list),
-        load: true,
-        loading: false,
-      })
-      if (res.data.total == 0) {
-        this.setData({
-          noData: true
-        })
-      } else if (this.data.list.length == res.data.total) {
-        this.setData({
-          end: true
-        })
-      }
-      wx.stopPullDownRefresh()
-    });
-  }
-})

pages/customer/score/index.json

@@ -1,9 +0,0 @@
-{
-  "navigationBarTitleText": "积分明细",
-  "enablePullDownRefresh": true,
-  "navigationBarTextStyle": "white",
-  "navigationBarBackgroundColor": "#1a1c26",
-  "backgroundColor": "#ffffff",
-  "backgroundColorTop": "#1a1c26",
-  "usingComponents": {}
-}

pages/customer/score/index.wxml

@@ -1,53 +0,0 @@
-<!--pages/customer/score/index.wxml 20250624-->
-<view class="container" style="min-height:100vh; overflow:hidden;">
-  <view class="text-center pt50 pb50">
-    <view class="font-60 text-bold text-italic color-ff0000">{{leftMoney}}</view>
-    <view class="color-444 font-28 mt-20">余额</view>
-  </view>
-  <view class="ml30 mr30 pb40">
-    <view class="bg-fff ulib-r10 box-shadow-000-10-10 pb30">
-      <view class="relative fn-flex text-center">
-        <view class="fn-flex-item pt30 pb30">
-          <view class="font-40">{{sumRechangeMoney}}</view>
-          <view class="font-26 color-666 mt5">充值</view>
-        </view>
-        <view class="fn-flex-item pt30 pb30">
-          <view class="font-40">{{sumUseMoney}}</view>
-          <view class="font-26 color-666 mt5">消耗</view>
-        </view>
-        <view class="bg-picker absolute top-0 box-center bg-no-repeat bg-size-cover bg-pos-cente font-26" style="width:230rpx;height:50rpx;line-height:50rpx;">
-          <picker mode="date" fields="month" value="{{cur_month}}" start="2015-09" end="2026-09" bindchange="bindDateChange">
-            <view class="color-666"><text class="iconfont icon-qianhetong"></text><text class="ml10">{{cur_month||'请选择月份'}}</text></view>
-          </picker>
-        </view>
-      </view>
-
-      <view class="pl30 pr30 pt30 pb60">
-        <view class="fn-flex font-28">
-          <block wx:for="{{tab_list}}" wx:key="index">
-            <view bind:tap="changeTab" data-index="{{index}}" class="pl10 pr10 pt5 pb5 ulib-r10 mr25 transition-all {{index==cur_tab_index?'bg-333 color-fff':'bg-f8 color-333'}}">{{item.name}}</view>
-          </block>
-        </view>
-        <view class="mt20">
-          <block wx:for="{{list}}" wx:for-item="item" wx:key="index">
-            <view class="bbs-1-eb pt20 pb20 fn-flex font-26">
-              <view class="wp25 color-ff0000 color-36afa2">{{item.money}}</view>
-              <view class="fn-flex-item text-center">{{item.content}}</view>
-              <view class="wp40 text-right">{{item.time}}</view>
-            </view>
-          </block>
-        </view>
-        <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>
-      </view>
-      <view class="fixed left-0 bottom-0 right-0 bg-fff-op90 pl40 pr40 pt20 pb40 z-index-1">
-        <view class="fn-flex text-center fn-flex-between">
-          <view class="fn-flex-item flexsize4 pt20 pb20 btn-36afa2 font-32 color-fff ulib-r750" bindtap="pushLink" data-url="/pages/customer/score/recharge">立即充值</view>
-        </view>
-      </view>
-    </view>
-  </view>
-
-
-
-
-</view>

pages/customer/score/index.wxss

@@ -1,4 +0,0 @@
-/* pages/customer/score/index.wxss */
-.bg-picker{
-    
-}

pages/customer/score/recharge.js

@@ -1,77 +0,0 @@
-// pages/customer/score/recharge.js 20250624
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    text: `爱能之家（厦门）新能源有限公司
-      账号：129260100100576097
-      开户行：兴业银行厦门自贸试验区象屿支行
-      备注：公司名称
-    `
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-  },
-  //充值
-  rechange(){
-    wx.showToast({
-      title: '系统维护中',
-      icon: 'none',
-      duration: 2000
-    })
-  }
-})

pages/customer/score/recharge.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/customer/score/recharge.wxml

@@ -1,40 +0,0 @@
-<!-- pages/customer/score/recharge.wxml 20250624-->
-<view class="container" style="min-height:100vh; overflow:hidden;">
-  <view class="inner30">
-    <view class="box-shadow-000-10-10 ulib-r20 inner30">
-      <view class="section">
-        <view class="fn-flex">
-          <view class="font-22 color-666">方式一 · 在线充值</view>
-        </view>
-        <view class="pl50 pr50 mt30">
-          <view class="font-30">
-            <text>充值金额</text><text class="font-40 pl20" style="color:#f00">￥20000</text>
-          </view>
-          <view class="mt30">
-            <button bind:tap="rechange" class="btn bg-36afa2 color-fff font-30 ulib-r750">立即充值</button>
-          </view>
-        </view>
-      </view>
-      <view class="section bts-1-eb pt40 mt40">
-        <view class="fn-flex fn-flex-center">
-          <view class="font-22 color-666 fn-flex-item">方式二 · 线下转账</view>
-          <view class="btn bds-1-eb font-20 ulib-r750 pl10 pr10 pt5 pb5"><text>复制信息</text></view>
-        </view>
-        <view class="pl50 pr50 mt30">
-          <view class="font-26 line-height-15">
-            <text>{{text}}</text>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="mt50 pl30 pr30 color-888 font-24">
-      <text>充值说明：</text>
-      <view class="mt10 line-height-15">
-        <view>1. 充值金额为<text class="color-ff0000">固定为20000元。</text></view>
-        <view>2. 微信充值后，积分实时到账（推荐）。</view>
-        <view >3. 线下转账方式需备注清楚公司名称，财务收到打款后会在1日内完成积分充值操作。</view>
-        <view >需开具充值发票请<text style="color:#527acc;">联系客服</text>。</view>
-      </view>
-    </view>
-  </view>
-</view>

pages/customer/score/recharge.wxss

@@ -1 +0,0 @@
-/* pages/customer/score/recharge.wxss */

pages/index/index.js

@@ -89,9 +89,8 @@ Page({
       id: 2,
       name: '门店'
     }],
-    score_role_cur: 0,
+    score_role_cur: 0
     //0924 end
-    biz_type_4s: 5 //门店类型4s店
   },
 
   onLoad(options) {
@@ -570,7 +569,7 @@ Page({
     _.apiQuery.getAppScore(params).then(res => {
       this.setData({
         scoreData: res.data,
-        score_trend: res.data.score_trend,
+        score_trend: res.data.score_trend ?? 1
       })
     })
   },

pages/index/index.wxml

@@ -7,7 +7,7 @@
           <lcb-auth type="userinfo" isShowProfile="{{isShowProfile}}" bind:onSuccess="getUserInfo"></lcb-auth>
         </view>
         <view>
-          <view class="font-22 color-fff">Hi~ {{hoursTip}}欢迎回到理车宝！</view>
+          <view class="font-22 color-fff">Hi~ {{hoursTip}}欢迎回到车卖场AHOH！</view>
           <view>
             <text class="text-middle text-bold font-48 color-fff">{{userInfo.uname}}</text>
             <text class="inline-block ml10 pl10 pr10 bg-fff text-bottom font-20 ulib-r750">{{userInfo.biz_name}}</text>
@@ -181,7 +181,7 @@
     </view>
 
     <!--订单跟进 -->
-    <view class="bg-fff mb30 box-shadow-000-10-10 ulib-r10" wx:if="{{userInfo.biz_type!=biz_type_4s}}">
+    <view class="bg-fff mb30 box-shadow-000-10-10 ulib-r10">
       <view class="inner30 pb20">
         <view class="font-36">订单跟进</view>
         <view class="fn-flex fn-flex-wrap pt20">

pages/mine/index.js

@@ -8,7 +8,6 @@ Page({
     mobile: '',
     isShowProfile: true, //是否显示授权用户信息按钮
     isShowSwitchingRoles: false,
-    biz_type_4s: 5 //门店类型4s店
   },
   onLoad: function (options) {
     for (let key in options) {
@@ -63,30 +62,11 @@ Page({
         // }
       ]
     }
-    // 20250624
+
-    // let mock_data = [{
-    //   icon:'https://img.liche.cn/lichebao/menu-1.png',
-    //   title:'积分余额',
-    //   tip:'7999',
-    //   url:'/pages/customer/score/index'
-    // },{
-    //   icon:'https://img.liche.cn/lichebao/menu-2.png',
-    //   title:'核销记录',
-    //   url:'/pages/customer/score/exchange'
-    // },{
-    //   icon:'https://img.liche.cn/lichebao/menu-3.png',
-    //   title:'联系客服',
-    //   type:1,
-    //   url:'13455556666'
-    // }]
-    // let menu_list = mock_data.concat(list)
-  // this.setData({
-  //     list: menu_list,
-  //   })
     this.setData({
       list: list,
     })
-    this.otherMenu()
+
     this.getUserInfo()
     console.log(this.data)
     wx.getSystemInfo({
@@ -123,17 +103,17 @@ Page({
       this.setData({
         userInfo: res
       })
-      // let list = this.data.list
+      if (res.group_id != 4) {
-      // if (res.group_id != 4) {
+        let list = this.data.list
-      //   list.push({
+        list.push({
-      //     icon: 'https://qs.liche.cn/lichebao/mine/icon-sucai2.png',
+          icon: 'https://qs.liche.cn/lichebao/mine/icon-sucai2.png',
-      //     title: '签到码',
+          title: '签到码',
-      //     url: '/pages/signup/code',
+          url: '/pages/signup/code',
-      //   })
+        })
-      //   this.setData({
+        this.setData({
-      //     list,
+          list,
-      //   })
+        })
-      // }
+      }
     });
   },
 
@@ -154,12 +134,7 @@ Page({
 
   //推送链接-敬请期待
   pushLinkMsg(e) {
-    // 20250624
+    if (e.currentTarget.dataset.url) {
-    if(e.currentTarget.dataset.type == 1){
-      wx.makePhoneCall({
-        phoneNumber: e.currentTarget.dataset.url,
-      })
-    }else if (e.currentTarget.dataset.url) {
       _.$router.openUrlScheme(e.currentTarget.dataset.url)
     } else {
       wx.showToast({
@@ -200,48 +175,4 @@ Page({
     })
   },
 
-  //20250624 扫码
-  bindScanCode(){
-    wx.scanCode({
-      success(res) {
-        let params = {
-          'sid':res.result
-        }
-        _.apiQuery.postAppCusorderDestroy(params).then(res => {
-          if (res.code == 200) {
-            wx.showToast({
-              title: res.msg,
-              icon: 'success',
-              duration: 2000
-            })
-          }else{
-            wx.showToast({
-              title: res.msg,
-              duration: 2000
-            })
-          }
-        });
-      },
-      fail(err) {
-        wx.showToast({
-          title: '扫描失败，请重试',
-          icon: 'none',
-          duration: 2000
-        });
-      },
-      
-    })
-  },
-  //其他菜单
-  otherMenu(){
-    _.apiQuery.getUserMenu().then(res => {
-      let list = res.data
-      if(list){
-        let menu_list = this.data.list.concat(list)
-        this.setData({
-          list: menu_list
-        })
-      }
-    });
-  }
 })

pages/mine/index.wxml

@@ -14,13 +14,7 @@
           <view class="mt10 font-22 color-666">{{userInfo.biz_name}}</view>
         </view>
 
-        <view class="absolute right-0 box-middle p240" >
+        <view class="absolute right-0 box-middle pb40" >
-          <!-- 20250624 -->
-          <!-- 隐藏扫码入口
-          <view class="bg-f6 mb25 pt10 pb10 pl20 pr15 font-22 color-666 ulib-rl750 fn-flex fn-flex-middle" bindtap="bindScanCode" wx:if="{{userInfo.biz_type==biz_type_4s}}">
-            <i class="custom-icon custom-icon-scancode mr10"></i><text>扫码</text>
-          </view>
-          -->
           <view class="bg-f6 mb25 pt10 pb10 pl20 pr15 font-22 color-666 ulib-rl750" bindtap="switchingRoles" wx:if="{{userInfo.group_name_arr.length>0}}">
             <i class="iconfont icon-cheliangfenpei mr10"></i>切换角色
           </view>
@@ -35,18 +29,16 @@
   <view class="pl40 pr40">
     <block wx:for="{{list}}" wx:key="index">
       <block wx:if="{{item.title == '账户设置'}}">
-        <view class="relative pt30 pb30 pl60 font-32" bindtap="pushLinkMsg" data-type="{{item.type}}" data-url="{{item.url}}?source={{source}}">
+        <view class="relative pt30 pb30 pl60 font-32" bindtap="pushLinkMsg" data-url="{{item.url}}?source={{source}}">
           <image class='absolute left-0 box-middle img-50x50' mode="aspectFill" src='{{item.icon}}' lazy-load="{{true}}"></image>
           <text>{{item.title}}</text>
-          <text wx:if="{{item.tip}}" class="absolute right-0 mr40 box-middle color-ff0000">{{item.tip}}</text>
           <i class="absolute right-0 box-middle iconfont icon-gengduo"></i>
         </view>
       </block>
       <block wx:else>
-        <view class="relative pt30 pb30 pl60 font-32" bindtap="pushLinkMsg" data-type="{{item.type}}" data-url="{{item.url}}">
+        <view class="relative pt30 pb30 pl60 font-32" bindtap="pushLinkMsg" data-url="{{item.url}}">
           <image class='absolute left-0 box-middle img-50x50' mode="aspectFill" src='{{item.icon}}' lazy-load="{{true}}"></image>
           <text>{{item.title}}</text>
-          <text wx:if="{{item.tip}}" class="absolute right-0 mr40 box-middle color-ff0000">{{item.tip}}</text>
           <i class="absolute right-0 box-middle iconfont icon-gengduo"></i>
         </view>
       </block>

pages/order/detail/index2.js

@@ -29,8 +29,6 @@ Page({
     confirm_count_down: 3,
     wxTimerList: {},
     wxTimer: null,
-    biz_type_4s: 5, //门店类型4s店
-    app_id_activity: 1
   },
   onLoad: function (options) {
     for (let key in options) {

pages/order/detail/index2.wxml

@@ -98,64 +98,63 @@
           </view>
         </view>
       </block>
-      <block wx:if="{{info.app_id!=app_id_activity}}">
+      <!--订单合同-->
-        <!--订单合同-->
+      <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editImg/index?id={{id}}&type=contract_img&title=订单合同&multi=true&edit={{info.status>0?'0':'1'}}">
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editImg/index?id={{id}}&type=contract_img&title=订单合同&multi=true&edit={{info.status>0?'0':'1'}}">
+        <view class="absolute left-0 box-middle font-32 color-333">订单合同</view>
-          <view class="absolute left-0 box-middle font-32 color-333">订单合同</view>
+        <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
+          <view>{{info.status>0?'已审核':contract_img.length>0?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
-            <view>{{info.status>0?'已审核':contract_img.length>0?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
-          </view>
         </view>
-        <!--付款凭证-->
+      </view>
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editImg/index?id={{id}}&type=pay_img&title=付款凭证&edit={{info.status>0?'0':'1'}}">
+      <!--付款凭证-->
-          <view class="absolute left-0 box-middle font-32 color-333">付款凭证</view>
+      <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editImg/index?id={{id}}&type=pay_img&title=付款凭证&edit={{info.status>0?'0':'1'}}">
-          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
+        <view class="absolute left-0 box-middle font-32 color-333">付款凭证</view>
-            <view>{{info.status>0?'已审核':pay_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
+        <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-          </view>
+          <view>{{info.status>0?'已审核':pay_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
         </view>
-        <!--权益确认书-->
+      </view>
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editImg/index?id={{id}}&type=equity_ck_img&title=权益确认书&multi=true&edit={{info.status>0?'0':'1'}}" wx:if="{{info.if_equity == 1}}">
+      <!--权益确认书-->
-          <view class="absolute left-0 box-middle font-32 color-333">权益确认书</view>
+      <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editImg/index?id={{id}}&type=equity_ck_img&title=权益确认书&multi=true&edit={{info.status>0?'0':'1'}}" wx:if="{{info.if_equity == 1}}">
-          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
+        <view class="absolute left-0 box-middle font-32 color-333">权益确认书</view>
-            <view>{{info.status>0?'已审核':equity_ck_img.length>0?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
+        <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-          </view>
+          <view>{{info.status>0?'已审核':equity_ck_img.length>0?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
         </view>
-        <!--上传发票-->
+      </view>
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editBillImg/index?id={{id}}&edit={{info.status>1?'0':'1'}}">
+      <!--上传发票-->
-          <view class="absolute left-0 box-middle font-32 color-333">发票</view>
+      <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editBillImg/index?id={{id}}&edit={{info.status>1?'0':'1'}}">
-          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
+        <view class="absolute left-0 box-middle font-32 color-333">发票</view>
-            <view>{{info.status>1?'已审核':bill_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
+        <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-          </view>
+          <view>{{info.status>1?'已审核':bill_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
         </view>
-        <!--上传行驶证-->
+      </view>
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editLicenseImg/index?id={{id}}&edit={{info.status>2?'0':'1'}}">
+      <!--上传行驶证-->
-          <view class="absolute left-0 box-middle font-32 color-333">行驶证</view>
+      <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editLicenseImg/index?id={{id}}&edit={{info.status>2?'0':'1'}}">
-          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
+        <view class="absolute left-0 box-middle font-32 color-333">行驶证</view>
-            <view>{{info.status>2?'已审核':car_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
+        <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-            <!-- <button bindtap="pushLink" data-url="/pages/order/editLicenseImg/index?id={{id}}" class="inline-block text-middle font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>{{register_img.value||car_img.value?'更新':'上传'}}</button> -->
+          <view>{{info.status>2?'已审核':car_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
-          </view>
+          <!-- <button bindtap="pushLink" data-url="/pages/order/editLicenseImg/index?id={{id}}" class="inline-block text-middle font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>{{register_img.value||car_img.value?'更新':'上传'}}</button> -->
         </view>
-        <!--上传保险单-->
+      </view>
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editInsImg/index?id={{id}}&edit={{info.status>2?'0':'1'}}">
+      <!--上传保险单-->
-          <view class="absolute left-0 box-middle font-32 color-333">保险单</view>
+      <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editInsImg/index?id={{id}}&edit={{info.status>2?'0':'1'}}">
-          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
+        <view class="absolute left-0 box-middle font-32 color-333">保险单</view>
-            <view>
+        <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-              <block wx:if="{{info.status>2}}">已审核</block>
+          <view>
-              <block wx:else>{{imgInfo.imgs.accident_img.value||imgInfo.imgs.insurance_img.value||imgInfo.imgs.business_img.value?'更新':'上传'}}</block>
+            <block wx:if="{{info.status>2}}">已审核</block>
-              <i class="iconfont ml10 icon-gengduo"></i>
+            <block wx:else>{{imgInfo.imgs.accident_img.value||imgInfo.imgs.insurance_img.value||imgInfo.imgs.business_img.value?'更新':'上传'}}</block>
-            </view>
+            <i class="iconfont ml10 icon-gengduo"></i>
-            <!-- <button bindtap="pushLink" data-url="/pages/order/editInsImg/index?id={{id}}" class="inline-block text-middle font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>{{ins_img.length>0?'更新':'上传'}}</button> -->
           </view>
+          <!-- <button bindtap="pushLink" data-url="/pages/order/editInsImg/index?id={{id}}" class="inline-block text-middle font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>{{ins_img.length>0?'更新':'上传'}}</button> -->
         </view>
-        <!--车机实名认证-->
+      </view>
-        <!--view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editImg/index?id={{id}}&type=car_auth_img&title=车机实名认证&edit={{info.status>2?'0':'1'}}">
+      <!--车机实名认证-->
+      <!--view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editImg/index?id={{id}}&type=car_auth_img&title=车机实名认证&edit={{info.status>2?'0':'1'}}">
         <view class="absolute left-0 box-middle font-32 color-333">实名认证</view>
         <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
           <view>{{info.status>2?'已审核':car_auth_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
         </view>
       </view-->
-        <!--上传交车合照-->
+      <!--上传交车合照-->
-        <!--
+      <!--
         <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editImg/index?id={{id}}&type=delivery_ck_img&title=交车合照">
           <view class="absolute left-0 box-middle font-32 color-333">交车合照</view>
           <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
@@ -163,7 +162,6 @@
           </view>
         </view>
         -->
-      </block>
       <!--图片展示-->
       <block wx:if="{{imgInfo.img_status==2}}">
         <!--身份证-->
@@ -273,20 +271,15 @@
     </view>
 
   </view>
-  <block wx:if="{{info.app_id==app_id_activity}}">
+
-    <!--4s店铺按钮显示-->
+  <view class="fixed left-0 right-0 bottom-0 pt20 pl30 pr30 pb40 bg-000-op80 fn-flex" style="z-index:999" wx:if="{{userInfo.group_id==4 && info.status<3}}">
-    <view class="fixed left-0 right-0 bottom-0 pt20 pl30 pr30 pb40 bg-000-op80 fn-flex" style="z-index:999" wx:if="{{userInfo.group_id==2 && info.status<3}}">
+    <button bindtap="postConfirmOrder" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">{{info.bt_cn}}</button>
-      <button bindtap="postConfirmOrder" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">{{info.bt_cn}}</button>
+  </view>
-    </view>
+
-  </block>
+  <view class="fixed left-0 right-0 bottom-0 pt20 pl30 pr30 pb40 bg-000-op80 fn-flex z-index-9999" wx:if="{{userInfo.group_id < 4 && info.status==0}}">
-  <block wx:else>
+    <button bindtap="delAppCusorder" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover"><i class="iconfont mr5 icon-zuofei"></i>订单作废</button>
-    <view class="fixed left-0 right-0 bottom-0 pt20 pl30 pr30 pb40 bg-000-op80 fn-flex" style="z-index:999" wx:if="{{userInfo.group_id==4 && info.status<3}}">
+  </view>
-      <button bindtap="postConfirmOrder" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">{{info.bt_cn}}</button>
+
-    </view>
-    <view class="fixed left-0 right-0 bottom-0 pt20 pl30 pr30 pb40 bg-000-op80 fn-flex z-index-9999" wx:if="{{userInfo.group_id < 4 && info.status==0}}">
-      <button bindtap="delAppCusorder" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover"><i class="iconfont mr5 icon-zuofei"></i>订单作废</button>
-    </view>
-  </block>
 </view>
 <lcb-backChannel></lcb-backChannel>
 

pages/order/edit/index2.js

@@ -61,9 +61,7 @@ Page({
     confirm_amount: '', //定⾦
     discount_amount: '', //⻋身优惠
     business_type: 0,
-    brand_page_show: false,
+    brand_page_show: false
-    biz_type_4s: 5, //门店类型4s店
-    app_id_activity: 1
   },
   //生命周期函数--监听页面加载
   onLoad: function (options) {
@@ -104,15 +102,6 @@ Page({
         is_get_insure: parseInt(res.data.if_insure),
         if_equity: parseInt(res.data.if_equity),
       })
-      if (res.data.app_id == this.data.app_id_activity) { //活动线索
-        let tab = [{
-          title: '车辆信息',
-          step: 2,
-        }]
-        this.setData({
-          tab: tab
-        })
-      }
       /*匹配车辆信息*/
       //匹配品牌
       if (!!res.data.brand_id) {
@@ -603,16 +592,16 @@ Page({
   },
 
   //显示选择品牌
-  bindShowBrand() {
+  bindShowBrand(){
     this.setData({
       brand_page_show: true
     })
   },
 
   //获取品牌信息
-  getBrandData(e) {
+  getBrandData(e){
     // console.log(e.detail)
-    if (e.detail.index > -1 && e.detail.item) {
+    if(e.detail.index>-1&&e.detail.item){
       this.setData({
         brand_id: e.detail.item.id,
         brand_name: e.detail.item.name,

pages/order/edit/index2.wxml

@@ -20,9 +20,9 @@
               <text wx:else>{{brandArray[brandIndex]}}</text>
               <i class="iconfont ml5 icon-gengduo"></i>
             </picker> -->
-            <text wx:if="{{brand_name}}">{{brand_name}}</text>
+              <text wx:if="{{brand_name}}">{{brand_name}}</text>
-            <text class="color-ccc" wx:else>请选择</text>
+              <text class="color-ccc" wx:else>请选择</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
+              <i class="iconfont ml5 icon-gengduo"></i>
           </view>
         </view>
         <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{brandIndex != -1}}">
@@ -148,14 +148,9 @@
     </view>
     <view class="fixed left-0 right-0 bottom-0 bg-fff-op90 inner40 fn-flex safe-pb">
       <block wx:if="{{step==2}}">
-        <block wx:if="{{info.app_id==app_id_activity}}">
+        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="nextstep" wx:if="{{business_type==0||business_type==2}}">下一步</button>
-          <button class="wp100 btn-36afa2 ml20 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCusorderV2">确认</button>
+        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" wx:elif="{{business_type==1}}">下一步</button>
-        </block>
+        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="getAppBusiness" wx:elif="{{business_type==3}}">下一步</button>
-        <block wx:else>
-          <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="nextstep" wx:if="{{business_type==0||business_type==2}}">下一步</button>
-          <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" wx:elif="{{business_type==1}}">下一步</button>
-          <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="getAppBusiness" wx:elif="{{business_type==3}}">下一步</button>
-        </block>
       </block>
       <block wx:elif="{{step==3}}">
         <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="optstep" data-step="{{step-1}}">上一步</button>

pages/order/index.js

@@ -2,41 +2,41 @@ import _ from '../../commons/js/commons'
 const app = getApp()
 Page({
   data: {
-    searchInp: {
+    searchInp:{
       value: '',
       focus: false,
     },
-    key: '', //tab状态值
+    key:'',//tab状态值
-    list: [], //客户列表
+    list: [],//客户列表
     pageNo: 1,
     noData: false,
     end: false,
     load: true,
     loading: false,
-    flag: 1,
+    flag:1,
-    content: '', //短信内容
+    content:'',//短信内容
-    isRefresh: false, //判断返回是否需要刷新
+    isRefresh:false,//判断返回是否需要刷新
     isShowMobile: false,
-    v2OrderId: _.config.v2OrderId, //订单id临界切换版本
+    v2OrderId:_.config.v2OrderId,//订单id临界切换版本
 
-    isShowfilter: false, //是否显示筛查
+    isShowfilter:false,//是否显示筛查
-    type: '',
+    type:'',
-    order_s_time: '', //开始时间
+    order_s_time:'',//开始时间
-    order_e_time: '', //结束时间
+    order_e_time:'',//结束时间
 
     staffArray: [],
     staffobj: [],
-    employeeIndex: -1, //分配销售索引
+    employeeIndex:-1,//分配销售索引
-    employee_id: '', //分配销售ID
+    employee_id:'',//分配销售ID
 
-    brand_id: '', //品牌id
+    brand_id:'',//品牌id
-    car_id: '', //车系id
+    car_id:'',//车系id
-    v_id: '', //车辆版本id
+    v_id:'',//车辆版本id
-    brandIndex: -1, //车辆品牌索引
+    brandIndex:-1,//车辆品牌索引
-    modelIndex: -1, //车系车型索引
+    modelIndex:-1,//车系车型索引
-    levelIndex: -1, //车辆版本索引
+    levelIndex:-1,//车辆版本索引
-    brand_page_show: false,
+    brand_page_show:false,
-    brand_name: ''
+    brand_name:''
   },
   onLoad: function (options) {
     for (let key in options) {
@@ -58,9 +58,9 @@ Page({
   getAppCusorderTabs() {
     _.apiQuery.getAppCusorderTabs().then(res => {
       this.setData({
-        filters: res.data.filters,
+        filters:res.data.filters,
-        tab: res.data.tabs,
+        tab:res.data.tabs,
-        key: this.data.key == '' ? res.data.tabs[0].key : this.data.key,
+        key:this.data.key==''?res.data.tabs[0].key:this.data.key,
       })
 
       this.getAppCusorderList()
@@ -70,18 +70,18 @@ Page({
   },
 
   //切换tab
-  changeTab(e) {
+  changeTab(e){
     this.setData({
       key: this.data.tab[e.currentTarget.dataset.index].key,
-      type: '',
+      type:'',
-      order_s_time: '',
+      order_s_time:'',
-      order_e_time: '',
+      order_e_time:'',
     })
     this.searchSubmit()
   },
 
   // 显示弹框
-  showMobileMsg() {
+  showMobileMsg(){
     this.setData({
       isShowMobile: true
     })
@@ -96,11 +96,11 @@ Page({
 
     let admin_ids = ''
     this.data.staffobj.forEach(item => {
-      if (item.checked) {
+      if(item.checked){
-        if (admin_ids == '') {
+        if(admin_ids==''){
-          admin_ids = item.id
+          admin_ids=item.id
-        } else {
+        }else{
-          admin_ids = admin_ids + ',' + item.id
+          admin_ids=admin_ids+','+item.id
         }
       }
     })
@@ -109,26 +109,26 @@ Page({
     params['page'] = this.data.pageNo;
     params['size'] = 10;
     params['status'] = this.data.key;
-    if (this.data.searchInp.value != '') {
+    if(this.data.searchInp.value != ''){
       params['keyword'] = this.data.searchInp.value;
     }
-    if (this.data.type != '') {
+    if(this.data.type != ''){
       params['type'] = this.data.type;
     }
-    if (this.data.order_s_time != '' && this.data.order_e_time != '') {
+    if(this.data.order_s_time != ''&&this.data.order_e_time != ''){
       params['order_s_time'] = this.data.order_s_time;
       params['order_e_time'] = this.data.order_e_time;
     }
-    if (admin_ids != '') {
+    if(admin_ids!=''){
       params['admin_ids'] = admin_ids;
     }
-    if (this.data.brand_id != '') {
+    if(this.data.brand_id!=''){
       params['brand_id'] = this.data.brand_id;
     }
-    if (this.data.car_id != '') {
+    if(this.data.car_id!=''){
       params['car_id'] = this.data.car_id;
     }
-    if (this.data.v_id != '') {
+    if(this.data.v_id!=''){
       params['v_id'] = this.data.v_id;
     }
     _.apiQuery.getAppCusorderList(params).then(res => {
@@ -157,12 +157,12 @@ Page({
   },
 
   // 输入
-  searchInput(e) {
+  searchInput(e){
     this.setData({
       'searchInp.value': e.detail.value
     })
   },
-  searchFocus() {
+  searchFocus(){
     this.setData({
       'searchInp.focus': true,
     })
@@ -175,7 +175,7 @@ Page({
   },
 
   //提交搜索
-  searchSubmit() {
+  searchSubmit(){
     this.setData({
       list: [],
       pageNo: 1,
@@ -197,14 +197,14 @@ Page({
   },
 
   //推送链接
-  pushLink(e) {
+  pushLink(e){
-    if (e.currentTarget.dataset.url) {
+    if(e.currentTarget.dataset.url){
       _.$router.openUrlScheme(e.currentTarget.dataset.url)
     }
   },
 
   //显示隐藏高级搜索
-  optfilter() {
+  optfilter(){
     this.setData({
       isShowfilter: !this.data.isShowfilter
     })
@@ -212,16 +212,16 @@ Page({
   },
 
   //显示高级搜索
-  showfilter() {
+  showfilter(){
     this.setData({
-      isShowfilter: true,
+      isShowfilter:true,
     })
   },
 
   //确定高级搜索
   submitFilter() {
     this.setData({
-      isShowfilter: false,
+      isShowfilter:false,
     })
     this.searchSubmit()
   },
@@ -234,45 +234,45 @@ Page({
     })
 
     this.setData({
-      brand_name: '',
+      brand_name:'',
-      brand_id: '',
+      brand_id:'',
-      car_id: '',
+      car_id:'',
-      v_id: '',
+      v_id:'',
-      brandIndex: -1,
+      brandIndex:-1,
-      modelIndex: -1,
+      modelIndex:-1,
-      levelIndex: -1,
+      levelIndex:-1,
       staffobj,
-      type: '',
+      type:'',
-      order_s_time: '',
+      order_s_time:'',
-      order_e_time: '',
+      order_e_time:'',
     })
   },
 
   //单选
-  radioPicker(e) {
+  radioPicker(e){
-    if (e.currentTarget.dataset.type == 'type') {
+    if(e.currentTarget.dataset.type == 'type'){
       this.setData({
-        type: e.currentTarget.dataset.key,
+        type:e.currentTarget.dataset.key,
       })
     }
   },
 
   //开始时间
-  startDate(e) {
+  startDate(e){
     this.setData({
       order_s_time: e.detail.value,
     })
   },
 
   //结束时间
-  endDate(e) {
+  endDate(e){
     this.setData({
       order_e_time: e.detail.value,
     })
   },
 
   //获取销售顾问
-  getAppUserAdmins() {
+  getAppUserAdmins(){
     let params = {};
     params['page'] = 1;
     params['size'] = 1000;
@@ -286,7 +286,7 @@ Page({
         bizArray.push(item.name)
       })
       this.setData({
-        staffArray: staffArray,
+        staffArray:staffArray,
         staffobj: res.data.list,
       })
     });
@@ -295,41 +295,42 @@ Page({
   //显示分配订单
   showTransfer(e) {
     this.setData({
-      ids: [e.currentTarget.dataset.id],
+      ids:[e.currentTarget.dataset.id],
-      isShowTransfer: true,
+      isShowTransfer:true,
     })
   },
 
   //显示隐藏分配订单
   optTransfer(e) {
     this.setData({
-      employee_id: '',
+      employee_id:'',
-      employeeIndex: -1,
+      employeeIndex:-1,
-      isShowTransfer: !this.data.isShowTransfer,
+      isShowTransfer:!this.data.isShowTransfer,
     })
   },
 
   //选择店员
   changeEmployee(e) {
     let employee_id = ''
-    if (e.detail.value >= 0) {
+    if(e.detail.value >= 0){
       employee_id = this.data.staffobj[e.detail.value].id
     }
     this.setData({
       employee_id,
-      employeeIndex: e.detail.value,
+      employeeIndex:e.detail.value,
     })
   },
 
   //分配订单
-  putAppCusorderV2Admins() {
+  putAppCusorderV2Admins(){
     let that = this
-    if (that.data.employeeIndex == -1) {
+    if (that.data.employeeIndex == -1 ) {
       wx.showToast({
         title: '请选择车管家',
         icon: 'none'
       })
-    } else {
+    }
+    else{
       that.setData({
         submitFlag: true,
       })
@@ -344,12 +345,12 @@ Page({
           duration: 2000
         })
         that.setData({
-          isShowTransfer: false,
+          isShowTransfer:false,
-          submitFlag: false,
+          submitFlag:false,
         })
         that.onPullDownRefresh()
 
-      }).catch(res => {
+      }).catch(res=>{
         that.setData({
           submitFlag: false,
         })
@@ -358,60 +359,60 @@ Page({
   },
 
   //多选
-  checkPicker(e) {
+  checkPicker(e){
     this.setData({
-      ['staffobj[' + e.currentTarget.dataset.index + '].checked']: !this.data.staffobj[e.currentTarget.dataset.index].checked,
+      ['staffobj['+e.currentTarget.dataset.index+'].checked']:!this.data.staffobj[e.currentTarget.dataset.index].checked,
     })
   },
 
   //获取车型品牌
-  getAppSeriesBrands() {
+  getAppSeriesBrands(){
     _.apiQuery.getAppSeriesBrands().then(res => {
-      if (res.data.list.length > 0) {
+      if(res.data.list.length>0){
         let brandArray = []
         res.data.list.forEach(item => {
           brandArray.push(item.name)
         })
         this.setData({
-          brandArray: brandArray,
+          brandArray:brandArray,
-          brandList: res.data.list,
+          brandList:res.data.list,
         })
       }
     });
   },
 
   //获取车系车型
-  getAppSeries() {
+  getAppSeries(){
     let params = {};
     params['brand_id'] = this.data.brand_id;
     _.apiQuery.getAppSeries(params).then(res => {
-      if (res.data.list.length > 0) {
+      if(res.data.list.length>0){
         let modelArray = []
         res.data.list.forEach(item => {
           modelArray.push(item.name)
         })
         this.setData({
-          modelArray: modelArray,
+          modelArray:modelArray,
-          modelList: res.data.list,
+          modelList:res.data.list,
         })
       }
     });
   },
 
   //获取车辆版本
-  getAppSeriesAttrslevel() {
+  getAppSeriesAttrslevel(){
     let params = {};
     params['id'] = this.data.car_id;
     params['type'] = 0;
     _.apiQuery.getAppSeriesAttrs(params).then(res => {
-      if (res.data.total > 0) {
+      if(res.data.total>0){
         let levelArray = []
         res.data.list.forEach(item => {
           levelArray.push(item.title)
         })
         this.setData({
-          levelArray: levelArray,
+          levelArray:levelArray,
-          levelList: res.data.list,
+          levelList:res.data.list,
         })
       }
     });
@@ -419,14 +420,14 @@ Page({
 
   //选择品牌
   changeBrand(e) {
-    if (this.data.brandIndex != e.detail.value && e.detail.value >= 0) {
+    if(this.data.brandIndex != e.detail.value && e.detail.value >= 0){
       this.setData({
-        brand_id: this.data.brandList[e.detail.value].id,
+        brand_id:this.data.brandList[e.detail.value].id,
-        brandIndex: e.detail.value,
+        brandIndex:e.detail.value,
-        car_id: '', //车系id
+        car_id:'',//车系id
-        v_id: '', //车辆版本id
+        v_id:'',//车辆版本id
-        modelIndex: -1,
+        modelIndex:-1,
-        levelIndex: -1,
+        levelIndex:-1,
       })
       this.getAppSeries()
     }
@@ -434,12 +435,12 @@ Page({
 
   //选择车系
   changeModel(e) {
-    if (this.data.modelIndex != e.detail.value && e.detail.value >= 0) {
+    if(this.data.modelIndex != e.detail.value && e.detail.value >= 0){
       this.setData({
-        car_id: this.data.modelList[e.detail.value].id,
+        car_id:this.data.modelList[e.detail.value].id,
-        modelIndex: e.detail.value,
+        modelIndex:e.detail.value,
-        v_id: '', //车辆版本id
+        v_id:'',//车辆版本id
-        levelIndex: -1,
+        levelIndex:-1,
       })
       this.getAppSeriesAttrslevel()
     }
@@ -447,16 +448,16 @@ Page({
 
   //车辆版本
   changeLevel(e) {
-    if (this.data.levelIndex != e.detail.value && e.detail.value >= 0) {
+    if(this.data.levelIndex != e.detail.value && e.detail.value >= 0){
       this.setData({
-        v_id: this.data.levelList[e.detail.value].id,
+        v_id:this.data.levelList[e.detail.value].id,
-        levelIndex: e.detail.value,
+        levelIndex:e.detail.value,
       })
     }
   },
 
   //页面相关事件处理函数--监听用户下拉动作
-  onPullDownRefresh() {
+  onPullDownRefresh(){
     this.setData({
       list: [],
       pageNo: 1,
@@ -468,24 +469,24 @@ Page({
     })
 
     this.getAppCusorderTabs()
-    // this.getAppCusorderList()
+    this.getAppCusorderList()
   },
 
   //页面上拉触底事件的处理函数
-  onReachBottom() {
+  onReachBottom(){
-    if (this.data.noData || this.data.end || !this.data.load) return;
+    if (this.data.noData || this.data.end||!this.data.load) return;
     this.setData({
       flag: this.data.flag + 1
     })
     this.getAppCusorderList()
   },
-  bindShowBrand() {
+  bindShowBrand(){
     this.setData({
-      brand_page_show: true
+      brand_page_show:true
     })
   },
-  //获取品牌信息
+   //获取品牌信息
-  getBrandData(e) {
+   getBrandData(e) {
     console.log(e.detail)
     if (e.detail.index > -1 && e.detail.item) {
       this.setData({
@@ -502,35 +503,4 @@ Page({
       this.getAppSeries()
     }
   },
-  // 同意核销
-  bindAgreeCheckCode(e) {
-    let that = this
-    let index = e.currentTarget.dataset.index
-    let item = that.data.list[index]
-    let params = {
-      'id': item.id
-    }
-    wx.showModal({
-      content: '确定核销该订单',
-      success: function (res) {
-        if (res.confirm) {
-          _.apiQuery.postAppCusorderDestroy(params).then(res => {
-            if (res.code == 200) {
-              wx.showToast({
-                title: res.msg,
-                icon: 'success',
-                duration: 2000
-              })
-              that.onPullDownRefresh()
-            }else{
-              wx.showToast({
-                title: res.msg,
-                duration: 2000
-              })
-            }
-          });
-        }
-      }
-    });
-  },
 })

pages/order/index.wxml

@@ -139,13 +139,6 @@
                 </view>
               </view>
             </block>
-            <view class="pt20 fn-clear font-28" wx:if="{{item.destroy.is_show}}">
-              <view class="fn-fl color-333">{{'购车券'}}</view>
-              <view class="fn-fr wp60 text-nowrap fn-flex">
-                <view class="fn-flex-item"></view>
-                <button class="btn bg-36afa2 font-22 color-fff ulib-r750" catch:tap="{{item.destroy.status==0?'bindAgreeCheckCode':''}}" data-index="{{index}}">{{item.destroy.text}}</button>
-              </view>
-            </view>
           </view>
         </block>
         <view class="mt20 pt5 pb5 pl20 pr20 bg-f6 font-22 color-666 ulib-rlb750 ulib-rr750" wx:if="{{item.remark}}">注：{{item.remark}}</view>

pages/order/register/index.js

@@ -67,8 +67,7 @@ Page({
     register_amount: '', //上牌费
     confirm_amount: '', //定⾦
     discount_amount: '', //⻋身优惠
-    brand_page_show: false,
+    brand_page_show: false
-    biz_type_4s: 5 //门店类型4s店
   },
   //生命周期函数--监听页面加载
   onLoad: function (options) {
@@ -145,13 +144,9 @@ Page({
             icon: 'none'
           })
         } else {
-          if (this.data.userInfo.biz_type == this.data.biz_type_4s) {
+          this.setData({
-            this.showPreview();
+            step: 3,
-          } else {
+          })
-            this.setData({
-              step: 3,
-            })
-          }
         }
         break;
       case 3:
@@ -161,67 +156,46 @@ Page({
             icon: 'none'
           })
         } else {
-          this.showPreview();
+          let that = this
+          that.setData({
+            isPreview: true,
+            isFill: true,
+          })
+          wx.pageScrollTo({
+            scrollTop: 0
+          })
+
+          that.setData({
+            isShowcheck: true,
+            checkCount: 2,
+            checktext: 3 + 's'
+          })
+          let interval = setInterval(res => {
+            if (that.data.checkCount > 0) {
+              that.setData({
+                checkCount: that.data.checkCount - 1,
+                checktext: that.data.checkCount + 's'
+              })
+            } else {
+              clearInterval(interval)
+              that.setData({
+                checkCount: 5,
+                checktext: '我知道了'
+              })
+            }
+          }, 1000)
         }
         break;
 
     }
   },
-  showPreview() {
-    let that = this
-    that.setData({
-      isPreview: true,
-      isFill: true,
-    })
-    wx.pageScrollTo({
-      scrollTop: 0
-    })
 
-    that.setData({
-      isShowcheck: true,
-      checkCount: 2,
-      checktext: 3 + 's'
-    })
-    let interval = setInterval(res => {
-      if (that.data.checkCount > 0) {
-        that.setData({
-          checkCount: that.data.checkCount - 1,
-          checktext: that.data.checkCount + 's'
-        })
-      } else {
-        clearInterval(interval)
-        that.setData({
-          checkCount: 5,
-          checktext: '我知道了'
-        })
-      }
-    }, 1000)
-  },
   //获取用户信息
   getUserInfo() {
     _.apiQuery.getUserInfo().then(res => {
       this.setData({
         userInfo: res,
       })
-      if (res.biz_type == this.data.biz_type_4s) { //4s店铺
-        let main = [{
-          title: '个人',
-          value: 0
-        }]
-        let tab = [{
-            title: '客户信息',
-            step: 1,
-          },
-          {
-            title: '车辆信息',
-            step: 2,
-          }
-        ]
-        this.setData({
-          main: main,
-          tab: tab
-        })
-      }
     });
   },
 
@@ -543,7 +517,7 @@ Page({
       is_get_insure: e.detail.value ? 1 : 0
     })
   },
-  //20240926是否投保买贵必赔
+    //20240926是否投保买贵必赔
   changeIfEquity(e) {
     this.setData({
       if_equity: e.detail.value ? 1 : 0
@@ -551,16 +525,16 @@ Page({
   },
 
   //显示选择品牌
-  bindShowBrand() {
+  bindShowBrand(){
     this.setData({
       brand_page_show: true
     })
   },
 
   //获取品牌信息
-  getBrandData(e) {
+  getBrandData(e){
     // console.log(e.detail)
-    if (e.detail.index > -1 && e.detail.item) {
+    if(e.detail.index>-1&&e.detail.item){
       this.setData({
         brand_id: e.detail.item.id,
         brand_name: e.detail.item.name,

pages/order/register/index.wxml

@@ -206,7 +206,7 @@
             <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="digit" placeholder="请输入上牌费" model:value='{{register_amount}}' always-embed='{{true}}' />
           </view>
         </view>
-
+        
       </view>
     </view>
     <view class="fixed left-0 right-0 bottom-0 bg-fff-op90 inner40 fn-flex safe-pb">
@@ -215,14 +215,9 @@
       </block>
       <block wx:if="{{step==2}}">
         <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="optstep" data-step="{{step-1}}">上一步</button>
-        <block wx:if="{{userInfo.biz_type==biz_type_4s}}">
+        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="nextstep" wx:if="{{business_type==0||business_type==2}}">下一步</button>
-          <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="nextstep">登记预览</button>
+        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" wx:elif="{{business_type==1}}">下一步</button>
-        </block>
+        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="getAppBusiness" wx:elif="{{business_type==3}}">下一步</button>
-        <block wx:else>
-          <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="nextstep" wx:if="{{business_type==0||business_type==2}}">下一步</button>
-          <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" wx:elif="{{business_type==1}}">下一步</button>
-          <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="getAppBusiness" wx:elif="{{business_type==3}}">下一步</button>
-        </block>
       </block>
       <block wx:if="{{step==3}}">
         <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="optstep" data-step="{{step-1}}">上一步</button>
@@ -271,17 +266,16 @@
       <view class="absolute left-0 box-middle font-28 color-333">内饰颜色</view>
       <view class="pt30 pb30 text-right font-28 color-666">{{in_color}}</view>
     </view>
-    <block wx:if="{{userInfo.biz_type!=biz_type_4s}}">
+    <view class="mt40 font-32">其他信息</view>
-      <view class="mt40 font-32">其他信息</view>
+    <view class="relative bbs-1-eb pl190 last-b-none">
-      <view class="relative bbs-1-eb pl190 last-b-none">
+      <view class="absolute left-0 box-middle font-28 color-333">付款方式</view>
-        <view class="absolute left-0 box-middle font-28 color-333">付款方式</view>
+      <view class="pt30 pb30 text-right font-28 color-666">{{payment[paymentIndex]}}</view>
-        <view class="pt30 pb30 text-right font-28 color-666">{{payment[paymentIndex]}}</view>
+    </view>
-      </view>
+    <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{delry_time}}">
-      <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{delry_time}}">
+      <view class="absolute left-0 box-middle font-28 color-333">期望交付时间</view>
-        <view class="absolute left-0 box-middle font-28 color-333">期望交付时间</view>
+      <view class="pt30 pb30 text-right font-28 color-666">{{delry_time}}</view>
-        <view class="pt30 pb30 text-right font-28 color-666">{{delry_time}}</view>
+    </view>
-      </view>
+    <!--
-      <!--
     <block wx:if="{{paymentIndex == 1}}">
       <view class="relative bbs-1-eb last-b-none pl180 font-28">
         <view class="absolute left-0 box-middle color-333">首付类型</view>
@@ -301,44 +295,43 @@
       </view>
     </block>
     -->
-      <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{confirm_amount}}">
+    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{confirm_amount}}">
-        <view class="absolute left-0 box-middle color-333">定金</view>
+      <view class="absolute left-0 box-middle color-333">定金</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{confirm_amount}}</text>元</view>
+      <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{confirm_amount}}</text>元</view>
+    </view>
+    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{discount_amount}}">
+      <view class="absolute left-0 box-middle color-333">车身优惠</view>
+      <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{discount_amount}}</text>元</view>
+    </view>
+    <view class="bbs-1-eb last-b-none">
+      <view class="relative pl190">
+        <view class="absolute left-0 box-middle font-28 color-333">投保买贵必赔</view>
+        <view class="pt30 pb30 text-right font-28 color-666"> {{if_equity?'是':'否'}} </view>
       </view>
-      <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{discount_amount}}">
+    </view>
-        <view class="absolute left-0 box-middle color-333">车身优惠</view>
+    <view class="bbs-1-eb last-b-none">
-        <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{discount_amount}}</text>元</view>
+      <view class="relative pl190">
+        <view class="absolute left-0 box-middle font-28 color-333">是否店内投保</view>
+        <view class="pt30 pb30 text-right font-28 color-666"> {{is_get_insure?'是':'否'}} </view>
       </view>
-      <view class="bbs-1-eb last-b-none">
+    </view>
-        <view class="relative pl190">
+    <view class="bbs-1-eb last-b-none">
-          <view class="absolute left-0 box-middle font-28 color-333">投保买贵必赔</view>
+      <view class="relative pl190">
-          <view class="pt30 pb30 text-right font-28 color-666"> {{if_equity?'是':'否'}} </view>
+        <view class="absolute left-0 box-middle font-28 color-333">是否店内上牌</view>
-        </view>
+        <view class="pt30 pb30 text-right font-28 color-666"> {{is_get_brand?'是':'否'}} </view>
       </view>
-      <view class="bbs-1-eb last-b-none">
+    </view>
-        <view class="relative pl190">
+    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{register_amount && is_get_brand}}">
-          <view class="absolute left-0 box-middle font-28 color-333">是否店内投保</view>
+      <view class="absolute left-0 box-middle color-333">上牌费</view>
-          <view class="pt30 pb30 text-right font-28 color-666"> {{is_get_insure?'是':'否'}} </view>
+      <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{register_amount}}</text>元</view>
-        </view>
+    </view>
-      </view>
+    
-      <view class="bbs-1-eb last-b-none">
+    <!--
-        <view class="relative pl190">
-          <view class="absolute left-0 box-middle font-28 color-333">是否店内上牌</view>
-          <view class="pt30 pb30 text-right font-28 color-666"> {{is_get_brand?'是':'否'}} </view>
-        </view>
-      </view>
-      <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{register_amount && is_get_brand}}">
-        <view class="absolute left-0 box-middle color-333">上牌费</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{register_amount}}</text>元</view>
-      </view>
-
-      <!--
     <view class="relative ml40 bbs-1-eb pl140 font-22 color-666">
         <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>优惠</view>
         <view class="pt25 pb25 text-right" style="min-height:30rpx"><text class="mr10 color-f9394d">1515</text>元</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>
@@ -369,10 +362,8 @@
       <view class="font-36 text-center">订单登记成功</view>
       <view class="font-30 pt10 text-left">
         <view class="pt10 text-center">--- 请及时上传 ---</view>
-        <block wx:if="{{userInfo.biz_type!=biz_type_4s}}">
+        <view class="text-center">订单合同</view>
-          <view class="text-center">订单合同</view>
+        <view class="text-center">付款凭证</view>
-          <view class="text-center">付款凭证</view>
-        </block>
         <view class="text-center">客户身份证</view>
         <!--view class="text-center">《买贵必赔权益确认书》</view-->
       </view>

pages/score/index.js

@@ -259,7 +259,7 @@ Page({
     _.apiQuery.getAppScore(params).then(res => {
       this.setData({
         scoreData: res.data,
-        score_trend: res.data.score_trend,
+        score_trend: res.data.score_trend ?? 1
       })
     })
   },
@@ -280,7 +280,7 @@ Page({
       this.setData({
         userInfo: res
       })
-      if (res.group_id > 2 || this.data.is_biz === '1') {
+      if (res.group_id > 2) {
         this.setData({
           score_role_cur: 1,
           tab_rank_cur: 1

project.config.json

@@ -1,7 +1,7 @@
 {
   "appid": "wx4733380c110313ec",
   "compileType": "miniprogram",
-  "libVersion": "3.8.9",
+  "libVersion": "3.5.0",
   "packOptions": {
     "ignore": [],
     "include": []
@@ -19,24 +19,11 @@
       "disablePlugins": [],
       "outputPath": ""
     },
-    "condition": false,
+    "condition": false
-    "compileWorklet": false,
-    "uglifyFileName": false,
-    "uploadWithSourceMap": true,
-    "packNpmManually": false,
-    "minifyWXSS": true,
-    "minifyWXML": true,
-    "localPlugins": false,
-    "disableUseStrict": false,
-    "useCompilerPlugins": false,
-    "swc": false,
-    "disableSWC": true
   },
   "condition": {},
   "editorSetting": {
     "tabIndent": "insertSpaces",
     "tabSize": 2
-  },
+  }
-  "projectname": "lcb",
-  "simulatorPluginLibVersion": {}
 }

project.private.config.json

@@ -1,50 +1,56 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "lcb",
+  "setting": {
+    "compileHotReLoad": true,
+    "urlCheck": true
+  },
   "condition": {
     "miniprogram": {
       "list": [
         {
-          "name": "pages/customer/index",
+          "name": "pages/signup/index",
-          "pathName": "pages/customer/score/exchange",
+          "pathName": "pages/signup/index",
-          "query": "source=shop",
+          "query": "scene=25lzwSFJ3QcXvMLR6WIE2",
-          "scene": null,
+          "launchMode": "default",
-          "launchMode": "default"
+          "scene": 1047
         },
         {
-          "name": "pages/mine/index",
+          "name": "待跟进客户",
-          "pathName": "pages/mine/index",
+          "pathName": "pages/customer/filterList/index",
-          "query": "source=shop",
+          "query": "status=1&visit=1&title=待跟进客户",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/mine/index",
+          "name": "建卡",
-          "pathName": "pages/mine/index",
+          "pathName": "pages/customer/addCard/index",
+          "query": "status=0",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "门店",
+          "pathName": "pages/index/index",
+          "query": "biz_id=1",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "签到",
+          "pathName": "pages/signup/index",
+          "query": "key=9hPReOz0vYQ2qFHG4Nipj",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/login/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         }
       ]
     }
-  },
-  "libVersion": "3.8.9",
-  "projectname": "lcb",
-  "setting": {
-    "urlCheck": true,
-    "coverView": true,
-    "lazyloadPlaceholderEnable": false,
-    "skylineRenderEnable": false,
-    "preloadBackgroundData": false,
-    "autoAudits": false,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "showShadowRootInWxmlPanel": true,
-    "useStaticServer": false,
-    "useLanDebug": false,
-    "showES6CompileOption": false,
-    "compileHotReLoad": true,
-    "checkInvalidKey": true,
-    "ignoreDevUnusedFiles": true,
-    "bigPackageSizeSupport": false
   }
 }