root 3 лет назад
Родитель
Сommit
d093ee5aab

+ 0 - 0
common/models/ApproachOrder.php


+ 0 - 0
common/models/ApproachOrderGoods.php


+ 0 - 0
common/models/forms/ApproachOrderForm.php


+ 1 - 1
frontendApi/config/menu.php

@@ -48,7 +48,7 @@ return [
 //            ['name'=>'点位绑定列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'bind', 'routePath'=>'user/bind', 'show'=>1,],
 //            ['name'=>'点位绑定编辑', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'bind-edit', 'routePath'=>'user/bind-edit', 'show'=>0,],
             ['name'=>'Reset Password', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'password', 'routePath'=>'user/password', 'show'=>1],
-            ['name'=>'升级管理', 'class'=>'', 'icon'=>'', 'controller'=>'upgrade', 'action'=>'dec', 'routePath'=>'user/upgrade', 'show'=>1,'allow'=>'declarer',],
+            ['name'=>'Upgrade management', 'class'=>'', 'icon'=>'', 'controller'=>'upgrade', 'action'=>'dec', 'routePath'=>'user/upgrade', 'show'=>1,'allow'=>'declarer',],//升级管理
             ['name'=>'Entry Management', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec', 'routePath'=>'user/dec', 'show'=>1,'allow'=>'declarer',],
         ]
     ],

+ 3 - 3
frontendEle/src/router/index.js

@@ -224,11 +224,11 @@ export const constantRouterMap = [
         component: _import('user/upgrade'),
         name: 'user_upgrade',
         meta: {
-          title: '升级管理',
+          title: 'Upgrade management',//升级管理
           highLight: '/user/bind',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '会员管理', path: '/user/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Member management', path: '/user/index'},//会员管理
           ],
         },
       },

+ 30 - 30
frontendEle/src/views/user/upgrade.vue

@@ -2,41 +2,41 @@
     <div v-loading="loading">
         <div class="white-box">
             <el-form :model="form" ref="form"  label-width="250px" class="form-page">
-                <div class="hr-tip"><span>会员信息</span></div>
-                <el-form-item label="会员编号" prop="insertUserName">
+                <div class="hr-tip"><span>Member information<!-- 会员信息 --></span></div>
+                <el-form-item label="Member code" prop="insertUserName"><!-- 会员编号 -->
                     <el-input v-model="form.insertUserName"
-                    placeholder="请输入要升级的会员编号"
-                    :rules="{ required: true, message: '请输入升级的会员编号', trigger: 'blur' }"
+                    placeholder="Please enter the member number to be upgraded"
+                    :rules="{ required: true, message: 'Please enter the member number to be upgraded', trigger: 'blur' }"
                     @blur="upgradeInfo()"
-                    >
+                    ><!-- 请输入升级的会员编号 -->
                     </el-input>
                 </el-form-item>
-                <el-form-item label="会员级别">
+                <el-form-item label="Member level"><!-- 会员级别 -->
                     <el-input v-model="form.userDecName"
                     disabled
                     >
                     </el-input>
                 </el-form-item>
-                <el-form-item label="会员姓名">
+                <el-form-item label="Member name"><!-- 会员姓名 -->
                     <el-input v-model="form.userRealName"
                     disabled
                     >
                     </el-input>
                 </el-form-item>
-                <el-form-item label="加入日期">
+                <el-form-item label="Joining date"><!-- 加入日期 -->
                     <el-input v-model="form.addAt"
                     disabled
                     >
                     </el-input>
                 </el-form-item>
-                <el-form-item v-if="!isMax" label="升级方式">
+                <el-form-item v-if="!isMax" label="Upgrade way"><!-- 升级方式 -->
                     <el-input v-model="form.upgradeFunc"
                     disabled
                     >
                     </el-input>
                 </el-form-item>
-                <el-form-item v-if="!isMax" label="升级级别" prop="upgradeValue">
-                    <el-select v-model="form.upgradeValue" placeholder="请选择级别" @change="changeLevel">
+                <el-form-item v-if="!isMax" label="To upgrade level  " prop="upgradeValue"><!-- 升级级别 -->
+                    <el-select v-model="form.upgradeValue" placeholder="Please select a level" @change="changeLevel"><!-- 请选择级别 -->
                         <el-option
                         v-for="item in upgradeOption"
                         :key="item.ID"
@@ -45,7 +45,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item v-if="!isMax" label="升级补差业绩">
+                <el-form-item v-if="!isMax" label="Upgrade and make up performance"><!-- 升级补差业绩 -->
                     <el-input v-model="needDiffPv"
                     disabled
                     >
@@ -53,7 +53,7 @@
                 </el-form-item>
                 <el-form-item v-if="!isMax">
                     <template slot="label">
-                        升级购买商品
+                        Upgrade purchase product<!-- 升级购买商品 -->
                     </template>
                     <el-tabs type="border-card" v-model="decWay" style="position: relative;width: 600px;">
                         <!--<el-tab-pane name="1">
@@ -90,36 +90,36 @@
                             </el-table-column>
                         </el-table>
                         </el-tab-pane> -->
-                        <el-tab-pane label="商品" 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"
                                         width="55">
                                 </el-table-column>
 
-                                <el-table-column label="商品名称" prop="GOODS_NAME">
+                                <el-table-column label="product name" prop="GOODS_NAME"><!-- 商品名称 -->
 
                                 </el-table-column>
-                                <el-table-column label="商品编号" prop="GOODS_NO">
+                                <el-table-column label="product code" prop="GOODS_NO"><!-- 商品编号 -->
 
                                 </el-table-column>
-                                <el-table-column label="卖价" prop="SELL_PRICE">
+                                <el-table-column label="product price" prop="SELL_PRICE"><!-- 产品价格 -->
 
                                 </el-table-column>
-                                <el-table-column label="PV价格" prop="PRICE_PV">
+                                <el-table-column label="product BV" prop="PRICE_PV"><!-- BV价格 -->
 
                                 </el-table-column>
-                                <el-table-column label="数量" width="150">
+                                <el-table-column label="quantity" width="150"><!-- 数量 -->
                                     <template slot-scope="scope">
                                         <el-input-number size="mini" v-model="numList[scope.$index]"  :min="0" :max="Number(scope.row.STORE_NUMS)" @change="value=>{handleChange(value,scope.row.ID)}"></el-input-number>
                                     </template>
                                 </el-table-column>
                             </el-table>
                             <div class="white-box-footer flex">
-                                <el-button @click="getSum()">计算合计</el-button>
+                                <el-button @click="getSum()">Total calculation<!-- 计算合计 --></el-button>
                                 <div class='flex data' style="flex:1;justify-content: flex-end;">
-                                    <div style="margin-right:2rem">商品价格:¥{{sell_price_sum}}</div>
-                                    <div>商品PV:¥{{price_pv_sum}}</div>
+                                    <div style="margin-right:2rem"><!-- 商品价格 -->product price:¥{{sell_price_sum}}</div>
+                                    <div><!-- 商品PV -->product BV:¥{{price_pv_sum}}</div>
                                 </div>
                             </div>
                         </el-tab-pane>
@@ -127,19 +127,19 @@
                 </el-form-item>
                 <el-form-item v-if="!isMax">
                     <template slot="label">
-                        收货人
+                        Consignee<!-- 收货人 -->
                     </template>
                     <el-input v-model="form.consignee"></el-input>
                 </el-form-item>
                 <el-form-item v-if="!isMax">
                     <template slot="label">
-                        收货人手机
+                        Mobile phone<!-- 收货人手机 -->
                     </template>
                     <el-input v-model="form.acceptMobile"></el-input>
                 </el-form-item>
                 <el-form-item v-if="!isMax" prop="areaSelected">
                     <template slot="label">
-                        地区
+                        Region<!-- 地区 -->
                     </template>
                     <el-cascader
                             size="large"
@@ -161,15 +161,15 @@
                 </el-form-item>
                 <el-form-item v-if="!isMax">
                     <template slot="label">
-                        详细地址
+                        Detailed address<!-- 详细地址 -->
                     </template>
                     <el-input v-model="form.address"></el-input>
                 </el-form-item>
-                <el-form-item v-if="!isMax" label="备注">
+                <el-form-item v-if="!isMax" label="note"><!-- 备注 -->
                     <el-input type="textarea" v-model="form.remark"></el-input>
                 </el-form-item>
                 <el-form-item v-if="!isMax">
-                    <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">保存</el-button>
+                    <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">SAVE<!-- 保存 --></el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -353,14 +353,14 @@
             onSubmit() {
                 if (!this.form.insertUserName) {
                     this.$message({
-                        message: '请输入会员编号',
+                        message: 'Please enter the member code',//请输入会员编号
                         type: 'error'
                     })
                     return false;
                 }
                 if (!this.toLevel) {
                     this.$message({
-                        message: '请选择级别',
+                        message: 'Please select a level',//请选择级别
                         type: 'error'
                     })
                     return false