Merge branch '1.1.19' into test

# Conflicts:
#	src/views/system/order/index.vue

src/views/entry/fillMainInf.vue

@@ -17,7 +17,13 @@
           <el-form-item>
             <p class="main-form-title">企业资质信息</p>
           </el-form-item>
-
+          <el-form-item label="企业类型：" prop="organization_type" inline-message="true">
+            <el-radio-group v-model="mainForm.organization_type" size="mini">
+              <el-radio :label="2">小规模</el-radio>
+              <el-radio :label="1">一般纳税人</el-radio>
+            </el-radio-group>
+            <span class="tips-text"><i class="el-icon-warning h-warning"></i>请正确选择企业类型，会影响提现时所需发票的性质。小规模需提供普票，一般纳税人需提供专票</span>
+          </el-form-item>
           <el-form-item label="营业执照：" prop="license" >
             <div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;">
               <div style="padding-right:6px;">
@@ -272,6 +278,7 @@
         submitTime: [],
         // 主体信息
         mainForm: {
+          organization_type:2,
           license: '',
           organization_name: '',
           license_number: '',
@@ -289,6 +296,7 @@
         // 主体信息校验
         hasLicense: false,
         mainRules: {
+          organization_type:[{required: true, message: '企业类型', trigger: 'blur'}],
           license: [{required: true, message: '请上传营业执照电子版',validator: licenseValidator}],
           organization_name: [{required: true, message: '企业名称不能为空', trigger: 'blur'}],
           license_number: [{required: true, message: '统一社会代码不能为空', trigger: 'blur'}],

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

@@ -387,9 +387,14 @@
         this.goodsInfoForm = this.goodsinfodata;
         this.vediosrc = this.goodsinfodata.video
         if (this.goodsInfoForm.imgs.length > 0) {
+          var str=new RegExp("http");
           this.goodsInfoForm.imgs.forEach((item) => {
             let objImg = { 'url': '' }
+            if(str.test(item)){
               objImg.url = item;
+            }else{
+              objImg.url ='http://img.jxhh.com/'+item;
+            }
             this.goodsImgFileList.push(objImg);
           })
         }

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

@@ -710,9 +710,15 @@
         // 所有校验通过，整理数据
         // 获取 商品信息数据
         let spxxData = this.$refs.goodsInfo.goodsInfoForm;
-
-       
-
+        if (spxxData.imgs.length > 0) {
+          var str=new RegExp("http");
+          spxxData.imgs.forEach((item,index) => {
+            if(str.test(item)){
+            }else{
+              spxxData.imgs[index] ='http://img.jxhh.com/'+item;
+            }
+          })
+        }
         if( spxxData.imgs.length > 7 ) {
           this.$message({ type: 'warning',message: '商品信息中，商品图片最大数量为7张，请检查' });
           this.setFloorNavMountClick(0);

src/views/system/goodsimport/components/goodsdetail.vue

@@ -559,6 +559,15 @@
               this.scprice = response.data.price
               this.stock = Number(response.data.stock)
               this.lunimg = response.data.imgs
+              if(this.lunimg.length > 0) {
+                  var str=new RegExp("http");
+                  this.lunimg.forEach((item,index) => {
+                    if(str.test(item)){
+                    }else{
+                      this.lunimg[index] ='http://img.jxhh.com/'+item;
+                    }
+                  })
+        }
               this.source = 1
 
               this.specs = response.data.specs //规格
@@ -566,6 +575,15 @@
               this.specsitem = response.data.specs
               this.tmthird_id = response.data.goods_id
               this.picture = response.data.imgs
+              if(this.picture.length > 0) {
+                  var str=new RegExp("http");
+                  this.picture.forEach((item,index) => {
+                    if(str.test(item)){
+                    }else{
+                      this.picture[index] ='http://img.jxhh.com/'+item;
+                    }
+                  })
+        }
               // 品牌 数据处理
               // if(this.brandOptions && this.brandOptions.length > 0) {
               //   let numBrandId = Number(this.goodsinfor.goods_brand)

src/views/system/order/index.vue

@@ -206,7 +206,13 @@
                 </template>
               </el-table-column> -->
                 <el-table-column prop="refund_status" label="售后状态" width="180" align="center"
-                  :formatter="refundStatusFormatter"></el-table-column>
+                  :formatter="refundStatusFormatter">
+                  <template slot-scope="scope">
+                    {{refundStatusFormatter(scope.row.refund_status)}}
+                  {{item.order.after_sale_accomplish_time?timeFormatter(item.order.after_sale_accomplish_time):''}}
+                </template>
+                </el-table-column>
+                
                 <el-table-column prop="remark" label="订单备注" width="120" align="center">
                   <template slot-scope="scope">
                     {{item.order.remark?item.order.remark:'暂无备注内容'}}
@@ -220,7 +226,7 @@
                 <el-table-column label="操作" width="120" align="center" fixed="right">
                   <template slot-scope="scope">
                     <el-button type="text" @click="handleInfo(scope.row)">详情</el-button>
-                    <el-button :disabled="Number(scope.row.goods_status)!==0" type="text"
+                    <el-button :disabled="Number(scope.row.goods_status)!==0&&(Number(scope.row.status)!=0||Number(scope.row.status)!=5)" type="text"
                       @click="goShipping(scope.row.id,scope.row.goods_order_sn)">去发货</el-button>
                   </template>
                 </el-table-column>
@@ -555,7 +561,7 @@
       },
       /** 表格合并 列单元格 */
       arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex > 3 && columnIndex != 8 && columnIndex != 9) { // 用于设置要合并开始的列号
+        if (columnIndex > 2 && columnIndex != 7 && columnIndex != 5&& columnIndex != 8) { // 用于设置要合并开始的列号
           if (rowIndex === 0) { // 用于设置合并开始的行号
             return {
               rowspan: 100,　　　　　// 合并的行数
@@ -637,7 +643,7 @@
         return res
       },
       /** 售后状态 */
-      refundStatusFormatter(row, column, cellValue, index) {
+      refundStatusFormatter(cellValue) {
         let statusText = '--'
         if (cellValue == 1) {
           statusText = '申请仅退款'

src/views/system/shop/index.vue

@@ -19,7 +19,13 @@
           </div>
           <el-form ref="mainForm" :model="mainForm" label-width="180px" class="main-form-con"
                      size="small">
-
+              <el-form-item label="企业类型：" prop="organization_type" inline-message="true">
+                <el-radio-group v-model="mainForm.organization_type" size="mini">
+                  <el-radio :label="2">小规模</el-radio>
+                  <el-radio :label="1">一般纳税人</el-radio>
+                </el-radio-group>
+                <span class="tips-text"><i class="el-icon-warning h-warning"></i>请正确选择企业类型，会影响提现时所需发票的性质。小规模需提供普票，一般纳税人需提供专票</span>
+              </el-form-item>
               <el-form-item label="营业执照：" prop="license">
                 <div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;">
                   <div style="padding-right:6px;">
@@ -402,6 +408,7 @@
         reviewResult: '加载中。。',
         isMainItem: true,// 主体/企业信息 是否可以修改，目前暂时不能
         mainForm: {
+          organization_type:1,
           license: '',
           organization_name: '',
           license_number: '',