Merge branch 'new-version' into feature/dd-1799-groupbonus

backendApi/modules/v1/controllers/FinanceController.php

@@ -452,6 +452,22 @@ class FinanceController extends BaseController {
             'AUDIT_STATUS_NAME' => 'W.AUDIT_STATUS',
             'USER_NAME' => 'U.USER_NAME',
         ]);
+        if (isset($filter['request']['filterStatus'])) {
+            $status = explode(',',$filter['request']['filterStatus']);
+            $status = end($status);
+            if (is_numeric($status)) {
+                 $filter['condition'] .= " AND W.AUDIT_STATUS = $status";
+            }
+        }
+        if (isset($filter['request']['WITHDRAW_PERIOD_NUM'])) {
+            
+            $period = explode(',',$filter['request']['WITHDRAW_PERIOD_NUM']);
+            $periodNum = isset($period[1]) ? $period[1] : '';
+            if (is_numeric($periodNum)) {
+                 $filter['condition'] .= " AND W.WITHDRAW_PERIOD_NUM = $periodNum";
+            }
+        }
+           
         $form = new FinanceExportForm();
         $result = $form->run($filter, '提现申请');
         if (!$result) {

backendEle/src/views/config/base.vue

@@ -43,6 +43,7 @@
             <template v-else-if="item.INPUT_TYPE==='8'">
               <el-switch v-model="item.VALUE">
               </el-switch>
+              <span class="closeWeb" v-if="item.CONFIG_NAME=='siteClose'">关闭会员端，将清空全部缓存</span>
             </template>
             <template v-else>
               <el-input v-model="item.VALUE" placeholder="请输入内容">
@@ -110,5 +111,9 @@ export default {
 </script>
 
 <style scoped>
-
+.closeWeb {
+  color:red;
+  font-size:13px;
+  margin-left:10px;
+}
 </style>

common/models/forms/ConfigForm.php

@@ -95,6 +95,10 @@ class ConfigForm extends Model
             return null;
         }
         $afterData = Config::getConfigByType('base');
+        // 关闭会员端,清空redis
+        if (is_array($postData) && isset($postData['siteClose']) && $postData['siteClose'] === true) {
+            \Yii::$app->redis->flushdb();
+        }
         $this->adminOperateLogger->saveAfterContent=$afterData;
         unset($beforeData,$afterData);
         $this->adminOperateLogger->clean()->save([

common/models/forms/OrderDeleteForm.php

@@ -172,11 +172,11 @@ class OrderDeleteForm extends Model
             //退还
             $amountResult = false;
             if($payType == 'cash') {
-                $amountResult = Cash::changeUserCash($userId, 'CASH', +abs($payAmount), ['REMARK' => '退货退还余额']);
+                $amountResult = Cash::changeUserCash($userId, 'CASH', +abs($payAmount), ['REMARK' => '删单退回']);
             } else if ($payType == 'exchange') {
-                $amountResult = Balance::changeUserBonus($userId,'exchange_points', +abs($payAmount),['DEAL_TYPE_ID' => DealType::EXCHANGE_POINTS_EXCHANGE,'REMARK' => '退货退还无业绩兑换点数']);
+                $amountResult = Balance::changeUserBonus($userId,'exchange_points', +abs($payAmount),['DEAL_TYPE_ID' => DealType::EXCHANGE_POINTS_EXCHANGE,'REMARK' => '删单退回']);
             } else{
-                $amountResult = Balance::changeUserBonus($userId,'reconsume_points', +abs($payAmount),['DEAL_TYPE_ID' => DealType::RECONSUME_POINTS_EXCHANGE,'REMARK' => '退货退还复销点数']);
+                $amountResult = Balance::changeUserBonus($userId,'reconsume_points', +abs($payAmount),['DEAL_TYPE_ID' => DealType::RECONSUME_POINTS_EXCHANGE,'REMARK' => '删单退回']);
             }
             if ($amountResult !== true) {
                 $transaction->rollBack();

frontendApi/modules/v1/models/LoginForm.php

@@ -2,6 +2,7 @@
 namespace frontendApi\modules\v1\models;
 
 use common\components\Model;
+use common\helpers\Cache;
 use common\helpers\Date;
 use common\libs\LoginIpChecker;
 use common\models\UserInfo;
@@ -111,6 +112,12 @@ class LoginForm extends Model
         if(!$this->validate()){
             return false;
         }
+        // 判断是否关闭了站点 
+        $systemConfig = Cache::getSystemConfig();
+        if ($systemConfig['siteClose']['VALUE']) {
+            $siteCloseInfo = $systemConfig['siteCloseInfo']['VALUE'];
+            throw new Exception($siteCloseInfo);
+        }
         $transaction = \Yii::$app->db->beginTransaction();
         try{
             $this->getUser();

frontendEle/src/views/shop/order.vue

@@ -167,6 +167,8 @@
                 this.submitButtonStat = true
                 // let path = 'sure-order'
                 this.$prompt('请输入支付密码', '提示', {
+                    center:true,
+                    customClass:'myclass',
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     inputType: 'password',
@@ -263,7 +265,6 @@
         }
     }
 </script>
-
 <style scoped>
 .address{
     /* height: 3rem; */
@@ -294,3 +295,8 @@
     margin-right: 1rem;
 }
 </style>
+<style>
+.myclass {
+    width:260px;
+}
+</style>

frontendEle/src/views/user/dec.vue

@@ -18,13 +18,10 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="报单中心编号">
-                    <el-input v-model="form.decUserName"></el-input>
+                    <el-input v-model="form.decUserName"  :disabled="true"></el-input>
                 </el-form-item>
-
-
                 <el-form-item>
                     <template slot="label">
-
                         报单方式二选一
                     </template>
                     <el-tabs type="border-card" v-model="decWay" style="position: relative;width: 600px;">
@@ -118,13 +115,13 @@
                 </el-form-item>
                 <div class="hr-tip"><span>网络信息</span></div>
                 <el-form-item label="推荐人编号">
-                    <el-input v-model="form.recUserName" @change="handleChkRecUser">
+                    <el-input v-model.trim="form.recUserName" @change="handleChkRecUser">
                         <template slot="append">【{{recRealName}}】</template>
                     </el-input>
                 </el-form-item>
 
                 <el-form-item label="接点人编号">
-                    <el-input v-model="form.conUserName" @change="handleChkConUser">
+                    <el-input v-model.trim="form.conUserName" @change="handleChkConUser">
                         <template slot="append">【{{conRealName}}】</template>
                     </el-input>
                 </el-form-item>
@@ -143,27 +140,27 @@
 
                         会员姓名
                     </template>
-                    <el-input v-model="form.realName"></el-input>
+                    <el-input v-model.trim="form.realName"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <template slot="label">
 
                         会员手机
                     </template>
-                    <el-input v-model="form.mobile"></el-input>
+                    <el-input v-model.trim="form.mobile"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <template slot="label">
 
                         身份证号
                     </template>
-                    <el-input v-model="form.insertUserIdCard" maxlength="18" @blur="idcarChange"></el-input>
+                    <el-input v-model.trim="form.insertUserIdCard" maxlength="18" @blur="idcarChange"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <template slot="label">
                         登录密码
                     </template>
-                    <el-input v-model="form.password" maxlength="32" placeholder="请输入密码"></el-input>
+                    <el-input v-model.trim="form.password" maxlength="32" placeholder="请输入密码"></el-input>
                     <span style="color:red;font-size: 13px;">默认密码为身份证号码后六位
                     </span>
                 </el-form-item>
@@ -171,7 +168,7 @@
                     <template slot="label">
                         支付密码
                     </template>
-                    <el-input v-model="form.payPassword" maxlength="32" placeholder="请输入支付密码"></el-input>
+                    <el-input v-model.trim="form.payPassword" maxlength="32" placeholder="请输入支付密码"></el-input>
                     <span style="color:red;font-size: 13px;">默认密码为身份证号码后六位
                     </span>
                 </el-form-item>
@@ -179,14 +176,14 @@
                     <template slot="label">
                         收货人
                     </template>
-                    <el-input v-model="form.consignee"></el-input>
+                    <el-input v-model.trim="form.consignee"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <template slot="label">
 
                         收货人手机
                     </template>
-                    <el-input v-model="form.acceptMobile"></el-input>
+                    <el-input v-model.trim="form.acceptMobile"></el-input>
                 </el-form-item>
                 <el-form-item prop="areaSelected">
                     <template slot="label">
@@ -202,7 +199,7 @@
                     <template slot="label">
                         详细地址
                     </template>
-                    <el-input v-model="form.address"></el-input>
+                    <el-input v-model.trim="form.address"></el-input>
                 </el-form-item>
 
                 <div class="hr-tip"><span>银行信息</span></div>
@@ -222,10 +219,10 @@
                     </el-cascader>
                 </el-form-item>
                 <el-form-item label="开户支行">
-                    <el-input v-model="form.bankAddress"></el-input>
+                    <el-input v-model.trim="form.bankAddress"></el-input>
                 </el-form-item>
                 <el-form-item label="银行账号">
-                    <el-input v-model="form.bankNo" maxlength="19"></el-input>
+                    <el-input v-model.trim="form.bankNo" maxlength="19"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">保存</el-button>
@@ -239,14 +236,18 @@
     import Vue from 'vue'
     import network from '@/utils/network'
     import baseInfo from '@/utils/baseInfo'
+    import userInfo from '@/utils/userInfo'
     import store from '@/utils/vuexStore'
-     import tool from '@/utils/tool'
+    import tool from '@/utils/tool'
 
     export default {
         name: 'user_dec',
         mounted() {
             this.getData()
         },
+        created() {
+            this.getDecName()
+        },
         computed:{
             _tableData(){
                 if(this.tableData==null){
@@ -318,6 +319,9 @@
             }
         },
         methods: {
+            getDecName() {
+                this.form.decUserName = userInfo.userName()
+            },
             idcarChange() {
                 if (this.form.insertUserIdCard.length >= 6) {
                     this.form.payPassword = this.form.password = this.form.insertUserIdCard.substring(this.form.insertUserIdCard.length-6,this.form.insertUserIdCard.length);
@@ -337,15 +341,12 @@
                 console.log(this.sell_price_sum,this.price_pv_sum)
             },
             getData () {
-
                 network.getData(`user/dec`).then(response => {
-                    console.log(response)
                     this.loading = false;
                     this.form.insertUserName = response.userName;
                     this.allOpenBank = response.allOpenBank;
                     this.allDecPackage = response.allDecPackage;
                     this.allGoods = response.allGoods;
-                    console.log(this.allDecPackage);
                     let settingObj=this.allDecPackage;
                     let settingArr = Object.keys(settingObj).map(key => {
                         //console.log(key); //为每个键名
@@ -359,13 +360,8 @@
                     }
                      this.tableDatas=settingObj1;
                     // this.tableDatas=this.allGoods.map(item=>{return {...item,goodsNum:1}});
-
-                    console.log(this.tableDatas);
-                    console.log(this.numList);
                 }).catch(() => {
                 });
-
-
             },
             handleCurrentChange(val) {
                 console.log(val)