some fixes

common/models/forms/DeclarationForm.php

@@ -43,6 +43,7 @@ class DeclarationForm extends Model
     public $realName;
     public $insertUserIdCard;
     public $mobile;
+    public $email;
     public $address;
     public $openBank;
     public $bankAddress;
@@ -59,6 +60,8 @@ class DeclarationForm extends Model
     public $province;
     public $city;
     public $county;
+    public $cityName;
+    public $lgaName;
 
     // 传过来的全部数据
     public $allData;
@@ -172,7 +175,7 @@ class DeclarationForm extends Model
     {
         $parentScenarios =  parent::scenarios();
         $customScenarios = [
-            'userDec' => ['type','allData', 'decLv','decWay','insertUserName','password','payPassword', 'realName', 'insertUserIdCard', 'mobile', 'address', 'openBank', 'bankAddress', 'bankNo', 'bankProvince','bankCity','bankCounty', 'consignee','acceptMobile','province','city','county', 'conUserName', 'recUserName','decUserName', 'location'],
+            'userDec' => ['type','allData', 'decLv','decWay','insertUserName','password','payPassword', 'realName', 'insertUserIdCard', 'mobile', 'address', 'openBank', 'bankAddress', 'bankNo', 'bankProvince','bankCity','bankCounty', 'consignee','acceptMobile','province',/*'city','county',*/ 'conUserName', 'recUserName','decUserName', 'location', 'email'],
             'canDec' => ['type', 'insertUserName', 'insertUserIdCard', 'conUserName', 'recUserName', 'location'],
             'notFull' => ['type', 'insertUserName', 'conUserName', 'recUserName', 'location'],
         ];
@@ -624,7 +627,8 @@ class DeclarationForm extends Model
                     'REAL_PV' => $this->_decPv,
                     'BUY_NUMS' => 1,
                     'SKU_CODE' => $decPackage['PACKAGE_NO'],
-                    'GOODS_TITLE' => $decPackage['PACKAGE_NAME']
+                    'GOODS_TITLE' => $decPackage['PACKAGE_NAME'],
+                    'EMAIL' => $this->email
                 ];
             }else{
                 $ids = $this->goodsId;
@@ -645,7 +649,8 @@ class DeclarationForm extends Model
                                 'POINT' => $goods['POINT'],
                                 'BUY_NUMS' => intval($v),
                                 'SKU_CODE' => $goods['GOODS_NO'],
-                                'GOODS_TITLE' => $goods['GOODS_NAME']
+                                'GOODS_TITLE' => $goods['GOODS_NAME'],
+                                'EMAIL' => $this->email
                             ];
                         }
                     }
@@ -697,6 +702,7 @@ class DeclarationForm extends Model
         $user->REAL_NAME = $this->realName;
         $user->ID_CARD = $this->insertUserIdCard;
         $user->MOBILE = $this->mobile;
+        $user->EMAIL = $this->email;
         $user->ADDRESS = $this->address ? $this->address : '无';
         $user->OPEN_BANK = $this->openBank;
         $user->BANK_ADDRESS = $this->bankAddress;
@@ -710,8 +716,10 @@ class DeclarationForm extends Model
         $user->LAST_DEC_LV = $this->decLv;
         $user->EMP_LV = EmployLevel::getDefaultLevelId();
         $user->PROVINCE = $this->province ?? 0;
-        $user->CITY = $this->city ?? 0;
-        $user->COUNTY = intval($this->county) ?? 0;
+        $user->LGA_NAME = $this->lgaName;
+        $user->CITY_NAME = $this->cityName;
+//        $user->CITY = $this->city ?? 0;
+//        $user->COUNTY = intval($this->county) ?? 0;
         $user->AVATAR = 'avatar/1.png';
         $user->IS_DEC = 0;
         $user->DEC_ID = $this->_decId ?? null;
@@ -809,9 +817,12 @@ class DeclarationForm extends Model
         $orderModel->PAY_FREIGHT = 0;
         $orderModel->CONSIGNEE = $this->consignee;
         $orderModel->MOBILE = $this->acceptMobile;
+        $orderModel->EMAIL = $this->email;
         $orderModel->PROVINCE = $this->province;
-        $orderModel->CITY = $this->city;
-        $orderModel->COUNTY = intval($this->county) ?? 0;
+        $orderModel->LGA_NAME = $this->lgaName;
+        $orderModel->CITY_NAME = $this->cityName;
+//        $orderModel->CITY = $this->city;
+//        $orderModel->COUNTY = intval($this->county) ?? 0;
         $orderModel->ADDRESS = $this->address;
         $orderModel->WAREHOUSE = $warehouse;
         $orderModel->STATUS = 1;
@@ -838,8 +849,10 @@ class DeclarationForm extends Model
             $addressModel->CONSIGNEE = $this->consignee;
             $addressModel->MOBILE = $this->acceptMobile;
             $addressModel->PROVINCE = $this->province;
-            $addressModel->CITY = $this->city;
-            $addressModel->COUNTY = intval($this->county) ?? 0;
+//            $addressModel->CITY = $this->city;
+//            $addressModel->COUNTY = intval($this->county) ?? 0;
+            $addressModel->CITY_NAME = $this->cityName;
+            $addressModel->LGA_NAME = $this->lgaName;
             $addressModel->ADDRESS = $this->address;
             $addressModel->IS_DEFAULT = 1;
             if(!$addressModel->save()){

common/models/forms/OrderForm.php

@@ -74,7 +74,7 @@ class OrderForm extends Model
     {
         return [
             [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province','city','county','detailaddress','email'], 'trim'],
-            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province','city','county','detailaddress','email'], 'required'],
+            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province','city','county','detailaddress'/*,'email'*/], 'required'],
             [['status'], 'isStatus'],
             [['addressId'], 'isAddress'],
             [['payType'], 'isPayType'],
@@ -123,7 +123,7 @@ class OrderForm extends Model
             // 管理员修改备注
             'adminRemark' => ['sn', 'remark'],
             // 会员下单
-            'userOrder' => ['type','addressId', 'payType','goodsId','goodsNum', 'remark', 'payPassword', 'email'],
+            'userOrder' => ['type','addressId', 'payType','goodsId','goodsNum', 'remark', 'payPassword', /*'email'*/],
             // 帮会员复消下单
             'reconsumeOrder' => ['type','userName', 'payType','goodsId','goodsNum', 'remark', 'payPassword','consignee','acceptMobile','province',/*'city','county',*/'detailaddress'],
             // 管理员修改订单状态

common/models/forms/UserForm.php

@@ -83,7 +83,7 @@ class UserForm extends Model
             [['conUid', 'location'], 'required', 'on'=>['validateLocation', 'validateAddWithUid']],
             [['conUserName', 'location'], 'required', 'on'=>['validateLocationConName', 'validateAddWithName']],
 
-            [['nation','realName', 'mobile', 'idCard', 'openBank', 'bankAddress', 'bankNo', 'email'], 'required', 'on'=>'modifyProfile'],
+            [['nation','realName', 'mobile', 'idCard', 'openBank', 'bankAddress', 'bankNo'/*, 'email'*/], 'required', 'on'=>'modifyProfile'],
             [['oldPassword','verifyPassword'], 'required','on' => ['modifyPassword', 'modifyPasswordPay', 'noLoginModifyPassword']],
             [['password'], 'required','on' => ['modifyPassword', 'noLoginModifyPassword']],
             [['payPassword'], 'required','on' => ['modifyPasswordPay']],

frontendEle/src/views/bonus/other.vue

@@ -2,17 +2,17 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-table class="table-box" :data="tableData" style="width: 100%;">
-        <el-table-column label="Pay cycle" prop="PERIOD_NUM.value"><!-- 期数 -->
+        <el-table-column label="Pay cycle" prop="PERIOD_NUM.value" width="100"><!-- 期数 -->
         </el-table-column>
-        <el-table-column label="Welcome Bonus" prop="BONUS_TG.value"><!-- 销售奖金 -->
+        <el-table-column label="Welcome Bonus" prop="BONUS_TG.value" width="130"><!-- 销售奖金 -->
         </el-table-column>
 <!--        <el-table-column label="业绩奖金" prop="ORI_BONUS_QY.value">&lt;!&ndash; 业绩奖金 &ndash;&gt;-->
 <!--        </el-table-column>-->
-        <el-table-column label="Director Bonus" prop="ORI_BONUS_BS_MNT.value"><!-- 管理奖金 -->
+        <el-table-column label="Director Bonus" prop="ORI_BONUS_BS_MNT.value" width="125"><!-- 管理奖金 -->
         </el-table-column>
-        <el-table-column label="Team Bonus" prop="ORI_BONUS_BS_ABBR.value"><!-- 绩效奖金 -->
+        <el-table-column label="Team Bonus" prop="ORI_BONUS_BS_ABBR.value" width="120"><!-- 绩效奖金 -->
         </el-table-column>
-        <el-table-column label="Quarter Pool Bank(GPB)" prop="ORI_BONUS_QUARTER.value" width="200px"><!-- 季度分红 -->
+        <el-table-column label="Quarter Pool Bank(GPB)" prop="ORI_BONUS_QUARTER.value" width="190px"><!-- 季度分红 -->
         </el-table-column>
         <el-table-column label="Travel" prop="BONUS_TRAVEL.value"><!-- 旅游奖 -->
         </el-table-column>
@@ -20,9 +20,9 @@
         </el-table-column>
         <el-table-column label="Villa" prop="BONUS_HOUSE.value"><!-- 豪宅奖 -->
         </el-table-column>
-        <el-table-column label="Total bonus" prop="BONUS_TOTAL.value"><!-- 合计 -->
+        <el-table-column label="Total bonus" prop="BONUS_TOTAL.value" width="100"><!-- 合计 -->
         </el-table-column>
-        <el-table-column label="Actual bonus" prop="BONUS_REAL.value"><!-- 实发 -->
+        <el-table-column label="Actual bonus" prop="BONUS_REAL.value" width="110"><!-- 实发 -->
         </el-table-column>
         <el-table-column >
           <template slot-scope="scope">

frontendEle/src/views/user/dec.vue

@@ -152,6 +152,12 @@
                     </template>
                     <el-input v-model="form.mobile"></el-input>
                 </el-form-item>
+                <el-form-item>
+                  <template slot="label">
+                        Email
+                  </template>
+                  <el-input v-model="form.email"></el-input>
+                </el-form-item>
                 <el-form-item>
                     <template slot="label">
 
@@ -211,6 +217,18 @@
                     </template>
                     <el-input :disabled="addressDisabled" v-model="form.address"></el-input>
                 </el-form-item>
+                <el-form-item>
+                  <template slot="label">
+                    City<!-- 详细地址 -->
+                  </template>
+                  <el-input :disabled="addressDisabled" v-model="form.cityName"></el-input>
+                </el-form-item>
+                <el-form-item>
+                  <template slot="label">
+                    Local Government Area<!-- 详细地址 -->
+                  </template>
+                  <el-input :disabled="addressDisabled" v-model="form.lgaName"></el-input>
+                </el-form-item>
 
                 <div class="hr-tip"><span>Bank Info<!-- 银行信息 --></span></div>
 
@@ -296,12 +314,13 @@
                     password:'111111',
                     payPassword:'111111',
                     mobile:'',
+                    email:'',
                     packageId:'',
                     goodsId:[],
                     goodsNum:[],
                     province:'',
-                    city:'',
-                    county:'',
+                    cityName:'',
+                    lgaName:'',
                     way:"express"
                 },
                 conRealName: '-',
@@ -446,6 +465,9 @@
                     openBank: this.form.openBank,
                     bankAddress: this.form.bankAddress,
                     mobile: this.form.mobile,
+                    email: this.form.email,
+                    cityName: this.form.cityName,
+                    lgaName: this.form.lgaName,
 
                     bankProvince: this.form.bankAreaSelected[0] ? this.form.bankAreaSelected[0] : '',
                     bankCity: this.form.bankAreaSelected[1] ? this.form.bankAreaSelected[1] : '',