Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds

backendEle/src/views/shop/index.vue

@@ -217,6 +217,7 @@
                     cover:'',
                     textarea:'',
                     sellDiscount:'',
+                    pvSplit:'',
                     categoryType: '',
                     sellType: 1,
                     taxRate: 0,

common/models/forms/ReceiveAddressForm.php

@@ -78,7 +78,7 @@ class ReceiveAddressForm extends Model
         $parentScenarios =  parent::scenarios();
         $customScenarios = [
             'userAdd' => ['consignee', 'mobile', 'province', 'lgaName', 'cityName', 'address', 'isDefault'],
-            'userEdit' => ['id', 'consignee', 'mobile', 'province', /*'lgaName', 'cityName',*/ 'address', 'isDefault'],
+            'userEdit' => ['id', 'consignee', 'mobile', 'province', 'lgaName', 'cityName', 'address', 'isDefault'],
             'userIsDefault' => ['id', 'isDefault'],
         ];
         return array_merge($parentScenarios, $customScenarios);
@@ -133,7 +133,6 @@ class ReceiveAddressForm extends Model
             if ($this->isDefault) {
                 ReceiveAddress::updateAll(['IS_DEFAULT' => 0], 'USER_ID=:USER_ID', [':USER_ID'=>\Yii::$app->user->id]);
             }
-//            print_r($this);exit;
             if($this->scenario == 'userAdd'){
                 $this->_model->USER_ID = \Yii::$app->user->id;
                 $this->_model->USER_NAME = Info::getUserNameByUserId(\Yii::$app->user->id);

frontendApi/modules/v1/controllers/ConfigController.php

@@ -120,7 +120,7 @@ class ConfigController extends BaseController
     public function actionReceiveAddressAdd() {
         Region::updateToCache();
         if(\Yii::$app->request->isPost) {
-            return parent::edit(ReceiveAddressForm::class, '添加收货地址成功', 'userAdd', ['edit']);
+            return parent::edit(ReceiveAddressForm::class, 'Added Successfully', 'userAdd', ['edit']);
         }
         return static::notice('非法访问', 400);
     }
@@ -132,7 +132,7 @@ class ConfigController extends BaseController
      */
     public function actionReceiveAddressEdit() {
         if(\Yii::$app->request->isPost) {
-            return parent::edit(ReceiveAddressForm::class, '添加收货地址成功', 'userEdit', ['edit']);
+            return parent::edit(ReceiveAddressForm::class, 'Modified Successfully', 'userEdit', ['edit']);
         }
         return static::notice('非法访问', 400);
     }

frontendEle/src/views/config/receive-address-edit.vue

@@ -30,16 +30,25 @@
           </template>
           <el-input v-model="form.lgaName"></el-input>
         </el-form-item>
-        <el-form-item prop="areaSelected">
+<!--        <el-form-item prop="areaSelected">-->
+<!--          <template slot="label">-->
+<!--            <span class="text-danger">*</span>-->
+<!--            State&lt;!&ndash; 地区 &ndash;&gt;-->
+<!--          </template>-->
+<!--          <el-cascader-->
+<!--            size="large"-->
+<!--            :options="regionData"-->
+<!--            v-model="form.areaSelected">-->
+<!--          </el-cascader>-->
+<!--        </el-form-item>-->
+        <el-form-item>
           <template slot="label">
             <span class="text-danger">*</span>
             State<!-- 地区 -->
           </template>
-          <el-cascader
-            size="large"
-            :options="regionData"
-            v-model="form.areaSelected">
-          </el-cascader>
+          <el-select v-model="form.areaSelected">
+            <el-option v-for="(item,index) in regionData" :key="index" :label="item.label" :value="item.value"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <template slot="label">
@@ -85,7 +94,9 @@ export default {
       form: {
         consignee: '',
         mobile: '',
-        areaSelected: [],
+        areaSelected: '',
+        lgaName: '',
+        cityName: '',
         address: '',
         isDefault: false,
       },
@@ -100,7 +111,7 @@ export default {
       let postData = {
         consignee: this.form.consignee,
         mobile: this.form.mobile,
-        province: this.form.areaSelected[0] ? this.form.areaSelected[0] : '',
+        province: this.form.areaSelected ? this.form.areaSelected : '',
         // city: this.form.areaSelected[1] ? this.form.areaSelected[1] : '',
         // county: this.form.areaSelected[2] ? this.form.areaSelected[2] : '',
         lgaName: this.form.lgaName,
@@ -114,7 +125,7 @@ export default {
           id: this.$route.params.id,
           consignee: this.form.consignee,
           mobile: this.form.mobile,
-          province: this.form.areaSelected[0] ? this.form.areaSelected[0] : '',
+          province: this.form.areaSelected ? this.form.areaSelected : '',
           // city: this.form.areaSelected[1] ? this.form.areaSelected[1] : '',
           // county: this.form.areaSelected[2] ? this.form.areaSelected[2] : '',
           lgaName: this.form.lgaName,
@@ -136,10 +147,9 @@ export default {
     },
     getData () {
       network.getData(`config/receive-address-one/${this.$route.params.id}`).then(response => {
-        console.log(response)
         this.form.consignee = response.CONSIGNEE
         this.form.mobile = response.MOBILE
-        this.form.areaSelected[0] = response.PROVINCE
+        this.form.areaSelected = response.PROVINCE
         // this.form.areaSelected[1] = response.CITY
         // this.form.areaSelected[2] = response.COUNTY
         this.form.lgaName = response.LGA_NAME