Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/mallManagement/order/order_list/index.vue

@@ -382,7 +382,7 @@
                             "
                             style="margin-left: 10px"
                           >
-                            <el-button slot="reference" size="small" type="primary">发货</el-button>
+                            <el-button slot="reference" size="small" type="text">发货</el-button>
                           </el-popconfirm>
                           <el-button type="text" size="small" v-else @click="showLogistics(order, 'add')"
                             >发货</el-button