售后代码生成配置

2021-06-30 14:57:21 +08:00
parent 0c4966130f
commit fd6b93df8f
5 changed files with 104 additions and 60 deletions
--- a/.env.development
+++ b/.env.development
@ -1,7 +1,8 @@
 ENV = 'development'

 # 接口地址
-VUE_APP_BASE_API  = 'http://8.129.208.109:8001'
+# VUE_APP_BASE_API  = 'http://8.129.208.109:8001'
+VUE_APP_BASE_API  = 'http://www.itxzz.top'
 VUE_APP_WS_API = 'ws://8.129.208.109:8001'


--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@ -21,7 +21,12 @@
      </crudOperation>
    </div>
    <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+    <el-table
+    ref="table"
+    v-loading="crud.loading"
+    :data="crud.data"
+    style="width: 100%;"
+    @selection-change="crud.selectionChangeHandler">
      <el-table-column type="selection" width="55" />
      <el-table-column v-if="columns.visible('tableName')" :show-overflow-tooltip="true" prop="tableName" label="表名" />
      <el-table-column v-if="columns.visible('engine')" :show-overflow-tooltip="true" prop="engine" label="数据库引擎" />
@ -29,7 +34,8 @@
      <el-table-column v-if="columns.visible('remark')" :show-overflow-tooltip="true" prop="remark" label="备注" />
      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <!-- <span>{{ parseTime(scope.row.createTime) }}</span> -->
+          <span>{{ scope.row.createTime }}</span>
        </template>
      </el-table-column>
      <el-table-column label="操作" width="160px" align="center" fixed="right">
--- a/src/views/shop/order/detail.vue
+++ b/src/views/shop/order/detail.vue
@ -265,39 +265,39 @@
                  :description="item.acceptTime"></el-step>
      </el-steps>
    </el-dialog>
-<!--    <el-dialog title="修改收货人信息"-->
-<!--               :visible.sync="receiverDialogVisible"-->
-<!--               width="40%">-->
-<!--      <el-form :model="receiverInfo"-->
-<!--               ref="receiverInfoForm"-->
-<!--               label-width="150px">-->
-<!--        <el-form-item label="收货人姓名：">-->
-<!--          <el-input v-model="receiverInfo.receiverName" style="width: 200px"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="手机号码：">-->
-<!--          <el-input v-model="receiverInfo.receiverPhone" style="width: 200px">-->
-<!--          </el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="邮政编码：">-->
-<!--          <el-input v-model="receiverInfo.receiverPostCode" style="width: 200px">-->
-<!--          </el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="所在区域：">-->
-<!--          <v-distpicker :province="receiverInfo.receiverProvince"-->
-<!--                        :city="receiverInfo.receiverCity"-->
-<!--                        :area="receiverInfo.receiverRegion"-->
-<!--                        @selected="onSelectRegion"></v-distpicker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="详细地址：">-->
-<!--          <el-input v-model="receiverInfo.receiverDetailAddress" type="textarea" rows="3">-->
-<!--          </el-input>-->
-<!--        </el-form-item>-->
-<!--      </el-form>-->
-<!--      <span slot="footer" class="dialog-footer">-->
-<!--      <el-button @click="receiverDialogVisible = false">取 消</el-button>-->
-<!--      <el-button type="primary" @click="handleUpdateReceiverInfo">确 定</el-button>-->
-<!--      </span>-->
-<!--    </el-dialog>-->
+   <!-- <el-dialog title="修改收货人信息"
+              :visible.sync="receiverDialogVisible"
+              width="40%">
+     <el-form :model="receiverInfo"
+              ref="receiverInfoForm"
+              label-width="150px">
+       <el-form-item label="收货人姓名：">
+         <el-input v-model="receiverInfo.receiverName" style="width: 200px"></el-input>
+       </el-form-item>
+       <el-form-item label="手机号码：">
+         <el-input v-model="receiverInfo.receiverPhone" style="width: 200px">
+         </el-input>
+       </el-form-item>
+       <el-form-item label="邮政编码：">
+         <el-input v-model="receiverInfo.receiverPostCode" style="width: 200px">
+         </el-input>
+       </el-form-item>
+       <el-form-item label="所在区域：">
+         <v-distpicker :province="receiverInfo.receiverProvince"
+                       :city="receiverInfo.receiverCity"
+                       :area="receiverInfo.receiverRegion"
+                       @selected="onSelectRegion"></v-distpicker>
+       </el-form-item>
+       <el-form-item label="详细地址：">
+         <el-input v-model="receiverInfo.receiverDetailAddress" type="textarea" rows="3">
+         </el-input>
+       </el-form-item>
+     </el-form>
+     <span slot="footer" class="dialog-footer">
+     <el-button @click="receiverDialogVisible = false">取 消</el-button>
+     <el-button type="primary" @click="handleUpdateReceiverInfo">确 定</el-button>
+     </span>
+   </el-dialog> -->
    <!-- <el-dialog title="修改费用信息"
               :visible.sync="moneyDialogVisible"
               width="80%">
@ -766,9 +766,8 @@ import eRemark from './remark'
        }

        express(params).then(res=>{
-          console.log(res,89888)
          this.expressInfo = res.Traces
-          this.kuaidiDialogVisible=true;
+          this.kuaidiDialogVisible = true;
          this.logisticsList = this.expressInfo
        }).catch(err => {
        })
@ -784,9 +783,9 @@ import eRemark from './remark'
        });
      },
      onSelectRegion(data){
-        this.receiverInfo.receiverProvince=data.province.value;
-        this.receiverInfo.receiverCity=data.city.value;
-        this.receiverInfo.receiverRegion=data.area.value;
+        this.receiverInfo.receiverProvince = data.province.value;
+        this.receiverInfo.receiverCity = data.city.value;
+        this.receiverInfo.receiverRegion = data.area.value;
      },
      formatTime(time) {
        if (time == null || time === '') {
@ -925,6 +924,7 @@ import eRemark from './remark'
        this.markInfo.id=this.id;
        this.order.remark=null;
      },
+      // 备注订单
      handleMarkOrder(){
        this.$confirm('是否要备注订单?', '提示', {
          confirmButtonText: '确定',
@ -968,8 +968,8 @@ import eRemark from './remark'
      showLogisticsDialog(){
        this.express();

-      }, //获取当前订单状态
-
+      },
+      //获取当前订单状态
      getNowOrderStatus() {
        let id = this.$route.params.id || 0;

--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@ -67,7 +67,8 @@
      </div>
      <!--表单组件-->
      <eForm ref="form" :is-add="isAdd" />
-      <eDetail ref="form1" :is-add="isAdd" />
+      <!-- <eDetail ref="form1" :is-add="isAdd" /> -->
+      <!-- <eDetail ref="form1" :is-add="isAdd" /> -->
      <eRefund ref="form2" :is-add="isAdd" />
      <editOrder ref="form3" :is-add="isAdd" />
      <eRemark ref="form4" :is-add="isAdd" />
@ -97,23 +98,43 @@
        </el-table-column>
        <el-table-column prop="cartInfoList" width="300" label="商品信息">
          <template slot-scope="scope">
-            <div v-for="(item,index) in scope.row.cartInfoList" v-if="item.cartInfoMap.productInfo.attrInfo">
-            <span>
-              <img
-                style="width: 30px;height: 30px;margin:0;cursor: pointer;"
-                :src="item.cartInfoMap.productInfo.attrInfo.image"
-              >
-            </span>
+            <!-- <div v-for="(item,index) in scope.row.cartInfoList"
+            :key="index"
+            v-if="item.cartInfoMap.productInfo.attrInfo">
+              <span>
+                <img style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+                  :src="item.cartInfoMap.productInfo.attrInfo.image"
+                >
+              </span>
              <span>{{ item.cartInfoMap.productInfo.storeName }}&nbsp;{{ item.cartInfoMap.productInfo.attrInfo.suk }}</span>
              <span> | ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }}</span>
            </div>
            <div v-else>
-            <span><img
-              style="width: 30px;height: 30px;margin:0;cursor: pointer;"
-              :src="item.cartInfoMap.productInfo.image"
-            ></span>
+              <span>
+                <img
+                style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+                :src="item.cartInfoMap.productInfo.image">
+              </span>
              <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
              <span> | ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }}</span>
+            </div> -->
+            <div v-for="(item,index) in scope.row.cartInfoList"
+            :key="index">
+                <span v-if="item.cartInfoMap.productInfo.attrInfo">
+                  <img style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+                    :src="item.cartInfoMap.productInfo.attrInfo.image"
+                  >
+                </span>
+                <span v-else>
+                  <img
+                  style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+                  :src="item.cartInfoMap.productInfo.image">
+                </span>
+                <span>
+                  {{ item.cartInfoMap.productInfo.storeName }}
+                  <span v-if="item.cartInfoMap.productInfo.attrInfo">&nbsp;{{ item.cartInfoMap.productInfo.attrInfo.suk }}</span>
+                </span>
+                <span> | ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }}</span>
            </div>
          </template>
        </el-table-column>
@ -238,8 +259,7 @@
        style="margin-top: 8px;"
        layout="total, prev, pager, next, sizes"
        @size-change="sizeChange"
-        @current-change="pageChange"
-      />
+        @current-change="pageChange" />
    </el-footer>
  </div>
 </template>
@ -262,7 +282,15 @@
    mixins: [initData],
    data() {
      return {
-        delLoading: false, status: '-9', orderType: '0',createTime: '', checkList: [], printChecked: false, batchHandle: '', batchExport: '', listContent: [],
+        delLoading: false,
+        status: '-9',
+        orderType: '0',
+        createTime: '',
+        checkList: [],
+        printChecked: false,
+        batchHandle: '',
+        batchExport: '',
+        listContent: [],
        queryTypeOptions: [
          { key: 'orderId', display_name: '订单号' },
          { key: 'realName', display_name: '用户姓名' },
@ -323,7 +351,15 @@
      beforeInit() {
        this.url = 'api/yxStoreOrder'
        const sort = 'id,desc'
-        this.params = { page: this.page, size: this.size, sort: sort, orderStatus: this.status, orderType: this.orderType, createTime: this.createTime, listContent: this.listContent  }
+        this.params = {
+          page: this.page,
+          size: this.size,
+          sort: sort,
+          orderStatus: this.status,
+          orderType: this.orderType,
+          createTime: this.createTime,
+          listContent: this.listContent
+        }
        const query = this.query
        const type = query.type
        const value = query.value
@ -701,6 +737,7 @@
          this.$refs.multipleTable.clearSelection();
        }
      },
+      // 导出选中
      handlePrintOption(val){
        switch (val) {
          case '0':
--- a/vue.config.js
+++ b/vue.config.js
@ -17,7 +17,7 @@ module.exports = {
  productionSourceMap: false,
  devServer: {
    port: port,
-    open: true,
+    open: false,
    overlay: {
      warnings: false,
      errors: true