Merge remote-tracking branch 'origin/master'

src/page/index/top/index.vue

@@ -29,7 +29,7 @@
       </el-tooltip>
       </el-tooltip>
       <el-dropdown>
       <el-dropdown>
         <span class="el-dropdown-link">
         <span class="el-dropdown-link">
-          {{ userInfo.username }}
+          {{ userInfo.nickname }}
           <i class="el-icon-arrow-down el-icon--right"/>
           <i class="el-icon-arrow-down el-icon--right"/>
         </span>
         </span>
         <el-dropdown-menu slot="dropdown">
         <el-dropdown-menu slot="dropdown">

src/views/businessGoods/goodsEdit/goods_edit.vue

@@ -725,6 +725,9 @@
     align-items: center;
     align-items: center;
   }
   }
 
 
+  >>> .el-input-number__increase {
+    right: 1px!important
+  }
 
 
   .zm_info_body .zm_info_row:not(:first-child) {
   .zm_info_body .zm_info_row:not(:first-child) {
     margin-top: 10px;
     margin-top: 10px;

src/views/businessOrder/details.vue

@@ -162,12 +162,13 @@
               确认取消</el-button>
               确认取消</el-button>
         </span>
         </span>
       </el-dialog>
       </el-dialog>
+      <el-button type="primary" class="self_center" style="width: 100px;margin-top: 16px;" @click="$router.go(-1)">返回</el-button>
     </basic-container>
     </basic-container>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
-  import {getOrderInfo,cancelOrderMethod} from '@/api/mall/merchantMallorder'
+  import {getOrderInfo} from '@/api/mall/merchantMallorder'
   import {ZmMixin} from '@/mixins/ZmMixin.js'
   import {ZmMixin} from '@/mixins/ZmMixin.js'
   import {cancelOrderSubApi, shipsImmediatelyApi} from "@/api/mall/merchantMallgoods";
   import {cancelOrderSubApi, shipsImmediatelyApi} from "@/api/mall/merchantMallgoods";
   export default {
   export default {

vue.config.js

@@ -3,7 +3,7 @@
  * https://cli.vuejs.org/zh/config/
  * https://cli.vuejs.org/zh/config/
  */
  */
 const url = 'http://linshenxs-gateway:9999'
 const url = 'http://linshenxs-gateway:9999'
-// const url = 'http://47.108.51.175:9999'
+//const url = 'http://47.108.51.175:9999'
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']
 const productionGzipExtensions = ['js', 'css']
 module.exports = {
 module.exports = {