反馈需修改的内容

common/models/ShopGoods.php

@@ -35,7 +35,7 @@ class ShopGoods extends \common\components\ActiveRecord
     const SALE_TYPE = [
         1 => [
             'id' => 1,
-            'name' => 'Balance payment', //余额购买
+            'name' => 'Account Balance', //余额购买
             'label' => 'cash',
         ],
 //        2 => [

frontendApi/config/menu.php

@@ -29,7 +29,7 @@ return [
         'child'=>[
             ['name'=>'Products list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'index', 'routePath'=>'shop/index', 'show'=>1,],//商品列表
 //            ['name'=>'Repeat sales products', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'reconsume', 'routePath'=>'shop/reconsume', 'show'=>1,'allow'=>'studio'],//复消商品
-//            ['name'=>'Entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
+            ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
             ['name'=>'Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
         ]
     ],

frontendEle/src/views/bonus/index.vue

@@ -4,9 +4,9 @@
       <el-table class="table-box" :data="walletData" stripe style="width: 100%;">
         <el-table-column label="Account type" prop="walletName"></el-table-column><!-- 账户类型 -->
         <el-table-column label="Account balance" prop="amount"></el-table-column><!-- 账户余额 -->
-        <el-table-column label="Trading record"><!-- 交易记录 -->
+        <el-table-column label="History"><!-- 交易记录 -->
           <template slot-scope="scope">
-            <el-button type="primary" v-show="dealSwitch==1" size="small" @click.native="showFlow(scope.row.walletType,scope.row.walletName)">View Trading record</el-button><!-- 查看交易记录 -->
+            <el-button type="primary" v-show="dealSwitch==1" size="small" @click.native="showFlow(scope.row.walletType,scope.row.walletName)">View Record</el-button><!-- 查看交易记录 -->
           </template>
         </el-table-column>
       </el-table>
@@ -120,7 +120,7 @@
       getData() {
         let vueObj = this
         vueObj.loading = true
-        network.getData('bonus/index').then(response => {
+        network.getData('bonus/index').then(response => {
 			console.log(response);
           vueObj.walletData = response.wallet
           vueObj.dealSwitch = response.dealSwitch
@@ -208,4 +208,4 @@
 <style>
   .dialog-footer:after{content: '';
     clear: both;display: table;}
-</style>
+</style>

frontendEle/src/views/shop/index.vue

@@ -46,7 +46,7 @@
                 </el-tab-pane>
             </el-tabs>
             <div class="white-box-footer">
-                <el-button @click="goToAccounts()">Settle accounts</el-button><!--去结算-->
+                <el-button @click="goToAccounts()">Check Out</el-button><!--去结算-->
                 <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
             </div>
         </div>

frontendEle/src/views/shop/order.vue

@@ -96,10 +96,10 @@
                             <div>Account Balance</div><!-- 账户余额 -->
                             <div>₦ {{ balance.cash }} NGN</div>
                         </div>
-                        <div class="sum_box">
-                            <div>Exchange points</div><!-- 兑换点数 -->
-                            <div>{{ balance.exchange }}</div>
-                        </div>
+<!--                        <div class="sum_box">-->
+<!--                            <div>Exchange points</div>&lt;!&ndash; 兑换点数 &ndash;&gt;-->
+<!--                            <div>{{ balance.exchange }}</div>-->
+<!--                        </div>-->
                     </div>
 
                     <div v-if="category_type === 4">

frontendEle/src/views/user/dec.vue

@@ -4,30 +4,30 @@
             <el-form ref="form"  label-width="250px" class="form-page">
                 <div class="hr-tip"><span>Account Information<!--账号信息--></span></div>
 
-                <el-form-item label="Member code"><!--会员编号-->
+                <el-form-item label="New member code"><!--会员编号-->
                     <el-input v-model="form.insertUserName"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <template slot="label">
-                        Current entry level<!--实时报单级别-->
+                        Entry level<!--实时报单级别-->
                     </template>
                     <el-select v-model="form.decLv" placeholder="Select entry level" @change="selectOne($event)">
                         <el-option v-for="(item,index) in allDecLevel" :key="index" :label="item.LEVEL_NAME"
                                    :value="item.ID"></el-option>
                     </el-select><!--请选择报单级别-->
                 </el-form-item>
-                <el-form-item label="Entry Center code"><!--报单中心编号-->
+                <el-form-item label="Stockist Code"><!--报单中心编号-->
                     <el-input v-model="form.decUserName"></el-input>
                 </el-form-item>
 
 
                 <el-form-item>
                     <template slot="label">
-                        Select entry type<!--报单方式二选一-->
+                      Select Welcome Pack<!--报单方式二选一-->
                     </template>
-                    <el-tabs type="border-card" v-model="decWay" style="position: relative;width: 600px;">
+                    <el-tabs type="border-card" v-model="decWay" style="position: relative;width: 1000px;">
                         <el-tab-pane name="1">
-                            <span slot="label">Select entry Kitting products</span><!--报单级别套餐-->
+                            <span slot="label">Welcome Pack</span><!--报单级别套餐-->
                             <el-table class="table-box" :data="_tableData" stripe style="width: 100%;" highlight-current-row @current-change="handleCurrentChange">
                                 <el-table-column
                                         type="index"
@@ -35,37 +35,33 @@
                                 </el-table-column>
                                 <el-table-column label=" " width="50">
                                     <template slot-scope="scope">
-                        <span class="el-checkbox__input" :class="{'is-checked':scope && scope.row && currentRow && scope.row.ID==currentRow.ID}">
-                          <span class="el-checkbox__inner">
-                            </span>
-                          <input type="checkbox" aria-hidden="false" class="el-checkbox__original" value="">
-                        </span>
+                                      <span class="el-checkbox__input" :class="{'is-checked':scope && scope.row && currentRow && scope.row.ID==currentRow.ID}">
+                                        <span class="el-checkbox__inner">
+                                          </span>
+                                        <input type="checkbox" aria-hidden="false" class="el-checkbox__original" value="">
+                                      </span>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="Kit name" prop="PACKAGE_NAME"><!-- 套餐名称 -->
+                                <el-table-column label="Package Name" prop="PACKAGE_NAME"><!-- 套餐名称 -->
 
                                 </el-table-column>
-                                <el-table-column label="Kit price" prop="AMOUNT"><!-- 套餐金额 -->
+                                <el-table-column label="Price" prop="AMOUNT"><!-- 套餐金额 -->
 
                                 </el-table-column>
 
-                                <el-table-column label="Kit BV" prop="PV"><!-- 套餐PV -->
+                                <el-table-column label="BV" prop="PV"><!-- 套餐PV -->
 
                                     <template>
 
                                     </template>
                                 </el-table-column>
-                                <!--<el-table-column label="所属报单级别ID" prop="LEVEL_ID">-->
-                                    <!--<template>-->
 
-                                    <!--</template>-->
-                                <!--</el-table-column>-->
                                 <el-table-column label="Entry level" prop="LEVEL_NAME"><!-- 所属报单级别 -->
                                     <template>
 
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="Kit products" prop="PACKAGE_CONTENT"><!-- 套餐内容 -->
+                                <el-table-column label="Details" prop="PACKAGE_CONTENT"><!-- 套餐内容 -->
                                     <template >
 
                                     </template>
@@ -76,7 +72,7 @@
                                <el-button type="primary" @click="onclock" :loading="submitButton">保存</el-button>
                              </el-form-item>-->
                         </el-tab-pane>
-                        <el-tab-pane label="Select entry products" name="2"><!-- 商品报单 -->
+                        <el-tab-pane label="Product" name="2"><!-- 商品报单 -->
                             <el-table class="table-box" v-if="numList.length > 0" :data="tableDatas" stripe style="width: 100%;" highlight-current-row  @selection-change="handleSelectionChange">
                                 <el-table-column
                                         type="selection"
@@ -148,7 +144,7 @@
                 <el-form-item>
                     <template slot="label">
 
-                        Mobile number<!-- 会员手机 -->
+                        Phone number<!-- 会员手机 -->
                     </template>
                     <el-input v-model="form.mobile"></el-input>
                 </el-form-item>
@@ -161,7 +157,7 @@
                 <el-form-item>
                     <template slot="label">
 
-                        ID<!-- 身份证号 -->
+                        Identity No.<!-- 身份证号 -->
                     </template>
                     <el-input v-model="form.insertUserIdCard" maxlength="18"></el-input>
                 </el-form-item>
@@ -232,24 +228,24 @@
 
                 <div class="hr-tip"><span>Bank Info<!-- 银行信息 --></span></div>
 
-                <el-form-item label="Bank of deposit"><!-- 开户行 -->
+                <el-form-item label="Bank Name"><!-- 开户行 -->
                     <el-select v-model="form.openBank" placeholder="Select Bank"><!-- 请选择开户行 -->
                         <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
                                    :value="item.BANK_CODE"></el-option>
                     </el-select>
 
                 </el-form-item>
-                <el-form-item label="Bank area" prop="bankAreaSelected"><!-- 银行所在地区 -->
-                    <el-cascader
-                            size="large"
-                            :options="regionData"
-                            v-model="form.bankAreaSelected">
-                    </el-cascader>
-                </el-form-item>
-                <el-form-item label="Account opening branch"><!-- 开户支行 -->
+<!--                <el-form-item label="Bank area" prop="bankAreaSelected">&lt;!&ndash; 银行所在地区 &ndash;&gt;-->
+<!--                    <el-cascader-->
+<!--                            size="large"-->
+<!--                            :options="regionData"-->
+<!--                            v-model="form.bankAreaSelected">-->
+<!--                    </el-cascader>-->
+<!--                </el-form-item>-->
+                <el-form-item label="Account Name"><!-- 开户支行 -->
                     <el-input v-model="form.bankAddress"></el-input>
                 </el-form-item>
-                <el-form-item label="Bank account No"><!-- 银行账号 -->
+                <el-form-item label="Account Number"><!-- 银行账号 -->
                     <el-input v-model="form.bankNo" maxlength="19"></el-input>
                 </el-form-item>
                 <el-form-item>

frontendEle/src/views/user/index.vue

@@ -16,7 +16,7 @@
             <el-form-item label="Member name"><!-- 会员姓名 -->
               <el-input v-model="infoData.REAL_NAME" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="ID"><!-- 身份证号 -->
+            <el-form-item label="Identity No."><!-- 身份证号 -->
               <el-input v-model="infoData.ID_CARD" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="Phone number"><!-- 手机号 -->

frontendEle/src/views/user/upgrade.vue

@@ -5,8 +5,8 @@
                 <div class="hr-tip"><span>Member information<!-- 会员信息 --></span></div>
                 <el-form-item label="Member code" prop="insertUserName"><!-- 会员编号 -->
                     <el-input v-model="form.insertUserName"
-                    placeholder="Please enter the member number to be upgraded"
-                    :rules="{ required: true, message: 'Please enter the member number to be upgraded', trigger: 'blur' }"
+                    placeholder="Please enter member code."
+                    :rules="{ required: true, message: 'Please enter member code.', trigger: 'blur' }"
                     @blur="upgradeInfo()"
                     ><!-- 请输入升级的会员编号 -->
                     </el-input>