给老外加的需求

.env.development

@@ -2,10 +2,10 @@
 ENV = 'development'
 
 # 正式环境
-VUE_APP_BASE_API = 'http://pop.jxhh.com/api/v1'
+#VUE_APP_BASE_API = 'http://pop.jxhh.com/api/v1'
 
 # 测试环境
-#VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'
+VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'
 #VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1'
 
 # 文档模块 直接调用 sys开放接口

src/api/module/goods.js

@@ -172,3 +172,11 @@ export function goodsNewcopy(query) {
     params: query
   })
 }
+
+export function getfeature(data){
+  return request({
+    url:'/local/feature/list',
+    method: 'post',
+    params: data
+  })
+}
\ No newline at end of file

src/views/system/goods/add/components/goodsinfomation.vue

@@ -38,6 +38,16 @@
         <el-input v-model.trim="goodsInfoForm.conversion_unit" placeholder="请输入换算关系都数量值" style="width:420px;"></el-input>
         <span class="tip-span ml20">1包装单位=n计量单位，如：1箱=10个，请填写数字10</span>
       </el-form-item>
+      <el-form-item label="商品特性：" prop="featuresid">
+        <el-select v-model.trim="goodsInfoForm.featuresid" @change="featuresidclick" placeholder="请选择商品特性" style="width: 420px;">
+                     <el-option
+                       v-for="item in featuresall"
+                       :key="item.id"
+                       :label="item.value"
+                       :value="item.id"
+                     ></el-option>
+                   </el-select>
+      </el-form-item>
       <!-- <el-form-item label="商品产地：" prop="producing_area_id_list">
         <el-cascader ref="producing_area" filterable v-model.trim="goodsInfoForm.producing_area_id_list" :props="areaProps" placeholder="请选择"
                      style="width:420px;" size="mini" @change="matchIdName('producing_area')">
@@ -182,7 +192,7 @@
 </template>
 
 <script>
-  import { NewGetCategoryData, UploadImg, getByCategoryData, uploadVideo,synthesisList } from '@/api/module/goods'
+  import { NewGetCategoryData, UploadImg, getByCategoryData, uploadVideo,synthesisList,getfeature } from '@/api/module/goods'
   import { getBrandsInf } from '@/api/module/brand/brand'
   import { getAreaList } from '@/api/module/retreat/address'
   import { wareHoustList } from "@/api/system/wareHouse";
@@ -259,6 +269,7 @@
         }
       }
       return {
+        featuresall:[],
         dialogVisible: false,
         dialogImageUrl: '',
         videoflag: false,
@@ -298,6 +309,8 @@
           metering_unit: '', // 计量单位
           packaging_unit: '', // 包装单位
           conversion_unit: '', // 换算关系
+          features:[],//商品特性
+          featuresid:"",
           // ssfl: '', // 税收分类
           // tax_rate: 0, // 税率
           web_url: '',          // 外部链接
@@ -381,6 +394,8 @@
       // this.getBrands();
       // 综合接口，获取仓库，供应商，商品分组，计量单位，默认返回第一页的数据
       this.getSynthesisList();
+      this.getFeatureList()
+      
     },
     mounted() {
       if (this.goodsinfodata.goods_id) {
@@ -413,6 +428,33 @@
       this.getalllist(this.SSQGoodsList)
     },
     methods: {
+      featuresidclick(val){
+        console.log(val)
+        let platForm = []
+        if(this.featuresall.length>0){
+          this.featuresall.map(item => {
+          if (item.id == val) {
+            platForm.push(item)
+          }
+        })
+       this.goodsInfoForm.features = platForm
+     
+        }
+      },
+      getFeatureList(){
+        let data = {
+          page:1,
+           limit:30
+        }
+        getfeature(data).then(res=>{
+          if(res.code==1){
+            if(res.data.length==0){
+            }else{
+              this.featuresall = res.data
+            }
+          }
+        })
+      },
       // 更多设置 初始化 数据
       resetMoreSetting() {
         let resetPartData = {

src/views/system/goods/add/components/goodsparameter.vue

@@ -53,6 +53,21 @@
             <el-input size="mini" style="width:90%" v-model.trim="scope.row.volume" placeholder="请输入"></el-input>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="长">
+          <template slot-scope="scope">
+            <el-input size="mini" style="width:90%" v-model.trim="scope.row.length" placeholder="请输入"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="宽">
+          <template slot-scope="scope">
+            <el-input size="mini" style="width:90%" v-model.trim="scope.row.width" placeholder="请输入"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="高">
+          <template slot-scope="scope">
+            <el-input size="mini" style="width:90%" v-model.trim="scope.row.height" placeholder="请输入"></el-input>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="编码">
           <template slot-scope="scope">
             <el-input size="mini" style="width:90%" v-model.trim="scope.row.goods_code" placeholder="请输入"></el-input>
@@ -241,7 +256,42 @@
             <el-input size="mini" style="width:90%" v-model.trim="scope.row.volume" placeholder="请输入"></el-input>
           </template>
         </el-table-column>
-
+        <el-table-column align="center" prop="length" label="长">
+          <template slot="header">
+            <span>长</span>
+            <el-tooltip placemetn="top" >
+              <span slot="content">点击可批量设置</span>
+              <span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('length')"></span>
+            </el-tooltip>
+          </template>
+          <template slot-scope="scope">
+            <el-input size="mini" style="width:90%" v-model.trim="scope.row.length" placeholder="请输入"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="width" label="宽">
+          <template slot="header">
+            <span>宽</span>
+            <el-tooltip placemetn="top" >
+              <span slot="content">点击可批量设置</span>
+              <span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('width')"></span>
+            </el-tooltip>
+          </template>
+          <template slot-scope="scope">
+            <el-input size="mini" style="width:90%" v-model.trim="scope.row.width" placeholder="请输入"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="height" label="高">
+          <template slot="header">
+            <span>高</span>
+            <el-tooltip placemetn="top" >
+              <span slot="content">点击可批量设置</span>
+              <span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('height')"></span>
+            </el-tooltip>
+          </template>
+          <template slot-scope="scope">
+            <el-input size="mini" style="width:90%" v-model.trim="scope.row.height" placeholder="请输入"></el-input>
+          </template>
+        </el-table-column>
         <el-table-column align="center" prop="goods_code" label="编码">
           <template slot="header">
             <span>编码</span>
@@ -395,6 +445,9 @@ export default {
           stock_warning: '', // 库存预警
           weight: '',   // 重量 g
           volume: '', // 体积
+          length:'',
+          width:'',
+          height:'',
           goods_code: '', // 编码
           bar_code: '', // 条码
         }
@@ -451,6 +504,9 @@ export default {
           stock_warning: '', // 库存预警
           weight: '',   // 重量 g
           volume: '', // 体积
+          length:'',
+          width:'',
+          height:'',
           goods_code: '', // 编码
           bar_code: '', // 条码
         }

src/views/system/goods/add/index.vue

@@ -232,6 +232,8 @@
               goods_des: res.data.goods_des,       // 商品标签
               goods_name: res.data.goods_name,      // 商品标题
               category_id: res.data.category_id,
+              features:res.data.features,
+              featuresid:res.data.features.length>0?res.data.features[0].id:'',
               metering_unit: res.data.metering_unit !== 0 ? res.data.metering_unit : "",// 计量单位, 三目兼容老数据
               packaging_unit: res.data.packaging_unit !== 0 ? res.data.packaging_unit : "",// 包装单位
               conversion_unit: res.data.conversion_unit, // 换算关系

src/views/system/order/components/orderDetail.vue

@@ -43,6 +43,26 @@
                 x {{scope.row.total }}
               </template>
             </el-table-column>
+            <el-table-column label="长/宽/高" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.length }}<br/>
+                {{scope.row.width}} <br/>
+                {{scope.row.height }}
+              </template>
+            </el-table-column>
+            <el-table-column label="国家/邮箱/邮编" align="center">
+              <template slot-scope="scope">
+                {{ orderDetail.country }}<br/>
+                {{orderDetail.email}} <br/>
+                {{orderDetail.postal_code }}
+              </template>
+            </el-table-column>
+            <el-table-column label="商品特性" align="center">
+              <template slot-scope="scope">
+                {{scope.row.features.length>0?scope.row.features[0].value:'' }}
+              
+              </template>
+            </el-table-column>
             <el-table-column label="商品订单状态" align="center">
               <template slot-scope="scope">
                 {{ goodsStatusFormatter(scope.row.goods_status) }}
@@ -294,6 +314,7 @@
 
 <script>
 import {orderInfo, sendOrder, expressInfoNew, remarkOrder, orderInfoEdit,deliveryOrder, deliveryOrderAgain, toReissueOrderData,expressList} from '@/api/module/order'
+import {getfeature } from '@/api/module/goods'
 import {dateFormat} from '@/utils'
 import {getAreaList} from '@/api/module/retreat/address'
 export default {
@@ -312,6 +333,7 @@ export default {
   },
   data() {
     return {
+      features:'',
       radioshop:1,
       expressNum: '',
       express_sn: '',
@@ -348,8 +370,35 @@ export default {
   },
   watch: {},
   created() {},
-  mounted() {},
-  methods: {
+  mounted() {
+    this.getFeatureList()
+  },
+  methods: { 
+    getFeatureList(){
+        let data = {
+          page:1,
+           limit:30
+        }
+        getfeature(data).then(res=>{
+          if(res.code==1){
+            if(res.data.length==0){
+            }else{
+              this.platformList = res.data
+            }
+          }
+        })
+      },
+    getfeatures(arr){
+      let ids = arr[0].id
+      let platForm = ''
+        platformList.map(item => {
+          if (item.id == ids) {
+            platForm = item.value
+          }
+        })
+        return platForm
+     
+    },
     radioshopclick(){
       this.express_sn = ''
       this.expressNum = ''