pc开单处理报错，自取

ghs/src/views/order/components/order-detail.vue

@@ -16,7 +16,7 @@
 					</div>
 				</div>
 			</template>
-			<div class="order-manage-wrap">
+			<div class="order-manage-wrap" v-if="data!=''">
 
 				<!-- 花材信息 -->
 				<div class="card-wrap">

ghs/src/views/order/list.vue

@@ -1,67 +1,66 @@
 <template>
-	<div class="app-list-content">
-		<x-crud class="liu-crud-wrap order-list-wrap" @load="onLoad">
-			<!-- tabs -->
-			<template #slot-tabs>
-				<el-tabs class="liu-tabs" type="border-card" v-model="tabIndex" @tab-click="handleClick">
-					<el-tab-pane
-						v-for="(item, index) in tabsData"
-						:key="index"
-						:label="`${item.text}(${item.val})`"
-						:name="item.key"
-					></el-tab-pane>
-				</el-tabs>
-			</template>
+  <div class="app-list-content">
+    <x-crud class="liu-crud-wrap order-list-wrap" @load="onLoad">
+      <!-- tabs -->
+      <template #slot-tabs>
+        <el-tabs class="liu-tabs" type="border-card" v-model="tabIndex" @tab-click="handleClick">
+          <el-tab-pane
+              v-for="(item, index) in tabsData"
+              :key="index"
+              :label="`${item.text}(${item.val})`"
+              :name="item.key"
+          ></el-tab-pane>
+        </el-tabs>
+      </template>
 
-			<!-- 单号 -->
-			<template #table-column-orderSn="{scope}">
-				<el-link
-					:underline="true"
-					@click="detailShowFn(scope.row)"
-					style="font-size:12px;display:inline-block;"
-				>{{ scope.row.orderSn }}</el-link>
-			</template>
+      <!-- 单号 -->
+      <template #table-column-orderSn="{scope}">
+        <el-link
+            :underline="true"
+            @click="detailShowFn(scope.row)"
+            style="font-size:12px;display:inline-block;"
+        >{{ scope.row.orderSn }}</el-link>
+      </template>
 
-			<template #table-column-customName="{scope}">
-				<div>
-					{{ scope.row.customName }}
-				</div>
-			</template>
+      <template #table-column-customName="{scope}">
+        <div>
+          {{ scope.row.customName }}
+        </div>
+      </template>
 
-			<template #table-column-customMobile="{scope}">
-				<div v-if="scope.row.customMobile == ''">-</div>
-				<div v-else>{{ scope.row.customMobile }}</div>
-			</template>
+      <template #table-column-customMobile="{scope}">
+        <div v-if="scope.row.customMobile == ''">-</div>
+        <div v-else>{{ scope.row.customMobile }}</div>
+      </template>
 
-			<!-- 状态 -->
-			<template #table-column-status="{scope}">
-				<span v-if="scope.row.status == 2">待配送</span>
-				<span v-else-if="scope.row.status == 3">配送中</span>
-				<span v-else-if="scope.row.status == 4">已完成</span>
-				<span v-else-if="scope.row.status == 5">已取消</span>
-				<span v-else>待付款</span>
-			</template>
+      <!-- 状态 -->
+      <template #table-column-status="{scope}">
+        <span v-if="scope.row.status == 2">待配送</span>
+        <span v-else-if="scope.row.status == 3">配送中</span>
+        <span v-else-if="scope.row.status == 4">已完成</span>
+        <span v-else-if="scope.row.status == 5">已取消</span>
+        <span v-else>待付款</span>
+      </template>
 
-			<!-- 送达时间 -->
-			<template #table-column-reachTime="{scope}">
+      <!-- 送达时间 -->
+      <template #table-column-reachTime="{scope}">
 				<span>
 					{{scope.row.requireReachTime}}
 				</span>
-			</template>
+      </template>
 
-			<!-- 操作 -->
-			<template #slot-column-option="{scope}">
+      <!-- 操作 -->
+      <template #slot-column-option="{scope}">
         <template >
           <div style="display: flex">
             <div v-for="res in scope.row.buttonList" >
-				<el-button v-if="res.type=='item'&&res.show==1&&res.disable==0" size="small">改花材</el-button>
-				<el-button v-if="res.type=='item'&&res.show==1&&res.disable==1" size="small" disabled>改花材</el-button>
+              <el-button v-if="res.type=='item'&&res.show==1&&res.disable==0" size="small">该花材</el-button>
+              <el-button v-if="res.type=='item'&&res.show==1&&res.disable==1" size="small" disabled>该花材</el-button>
 
-				<el-button v-if="res.type=='send'&&res.show==1&&res.disable==0" @click="shipDrawFn(scope.row)" size="mini" type="primary" plain >发货</el-button>
-				<el-button v-if="res.type=='send'&&res.show==1&&res.disable==1" disabled size="mini" plain>发货</el-button>
+              <el-button v-if="res.type=='send'&&res.show==1&&res.disable==0" @click="shipDrawFn(scope.row)" size="mini" type="primary" plain >发货</el-button>
+              <el-button v-if="res.type=='send'&&res.show==1&&res.disable==1" disabled size="mini" type="primary" plain >发货</el-button>
 
-<<<<<<< HEAD
-              <el-popover v-if="res.type=='selfGet'&&res.show==1&&res.disable==0" style="margin-left:14px;" placement="top" width="160" :ref="'popover-'+scope.row.id">
+              <el-popover v-if="res.type=='selfGet'&&res.show==1&&res.disable==0" style="margin-left:14px;" placement="top" width="160" :ref="'popover-' + scope.row.id">
                 <p>确认已自取？</p>
                 <div style="text-align: right; margin: 0">
                   <el-button size="mini" type="text" @click="selfGetCancel(scope.row.id)">取消</el-button>
@@ -70,38 +69,52 @@
                 <el-button slot="reference" size="mini" type="primary" plain>自取</el-button>
               </el-popover>
               <el-button v-if="res.type=='selfGet'&&res.show==1&&res.disable==1" style="margin-left:14px;" size="small" disabled>自取</el-button>
-=======
-				<el-popover v-if="res.type=='selfGet'&&res.show==1&&res.disable==0" style="margin-left:14px;" placement="top" width="160" :ref="'popover-' + scope.row.id">
-				<p>确认已自取？</p>
-				<div style="text-align: right; margin: 0">
-					<el-button size="mini" type="text" @click="selfGetCancel(scope.row.id)">取消</el-button>
-					<el-button type="primary" size="mini" @click="noSendShipFn(scope.row)">确定</el-button>
-				</div>
-				<el-button slot="reference" size="mini" type="primary" plain>自取</el-button>
-				</el-popover>
 
-				<el-button v-if="res.type=='selfGet'&&res.show==1&&res.disable==1" style="margin-left:14px;" size="small" disabled>自取</el-button>
->>>>>>> c152898eff6c05dd8e94bfbce1875015c3e46726
-
-				<el-button v-if="res.type=='print'&&res.show==1&&res.disable==0" @click="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>
-				<el-button v-if="res.type=='print'&&res.show==1&&res.disable==1" disabled size="mini" plain style="margin-left:14px;">打印</el-button>
+              <el-button v-if="res.type=='print'&&res.show==1&&res.disable==0" @click="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>
+              <el-button v-if="res.type=='print'&&res.show==1&&res.disable==1" disabled size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>
             </div>
           </div>
         </template>
-			</template>
-		</x-crud>
-		<!-- 用户详情 -->
-		<order-detail ref="orderDetail" :orderOperate="optionData" />
-		<!-- 发货状态 -->
-		<sel-order ref="selOrder" :id="optionData.id" @song-success="onSongSuccess" />
+
+        <!--				<template v-if="scope.row.status == 1">-->
+        <!--					<el-button size="small" disabled>打印</el-button>-->
+        <!--					<el-button size="small" disabled>自取</el-button>-->
+        <!--					<el-button size="small" disabled>发货</el-button>-->
+        <!--				</template>-->
+        <!--				<template v-else-if="['4', '5', '6'].indexOf(scope.row.status) != -1"></template>-->
+        <!--				<template v-else>-->
+        <!--					<template v-if="scope.row.currentFlow == 1">-->
+        <!--						<el-popover placement="top" width="160" :ref="'popover-' + scope.row.id">-->
+        <!--							<p>确认已自取？</p>-->
+        <!--							<div style="text-align: right; margin: 0">-->
+        <!--								<el-button size="mini" type="text" @click="selfGetCancel(scope.row.id)">取消</el-button>-->
+        <!--								<el-button type="primary" size="mini" @click="noSendShipFn(scope.row)">确定</el-button>-->
+        <!--							</div>-->
+        <!--							<el-button slot="reference" size="mini" type="primary" plain>自取</el-button>-->
+        <!--						</el-popover>-->
+        <!--						<el-button @click="shipDrawFn(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">发货</el-button>-->
+        <!--						<el-button @click="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>-->
+        <!--					</template>-->
+        <!--					<template v-else>-->
+        <!--						<el-button size="mini" type="primary" plain @click="shipDrawFn(scope.row)">发货</el-button>-->
+        <!--						<el-button @click="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>-->
+        <!--					</template>-->
+
+        <!--				</template>-->
+      </template>
+    </x-crud>
+    <!-- 用户详情 -->
+    <order-detail ref="orderDetail" :orderOperate="optionData" />
+    <!-- 发货状态 -->
+    <sel-order ref="selOrder" :id="optionData.id" @song-success="onSongSuccess" />
     <!-- 配送单 -->
     <div class="print-html-box" >
 
       <table border="0" width="780" style="border:solid 1px #fff;border-collapse:collapse">
         <tr>
-          <td style="padding: 10px;width: 260px;">客户：{{orderInfo.customName}}</td>
-          <td style="padding: 10px;width: 260px;">单号：{{orderInfo.orderSn}}</td>
-          <td style="padding: 10px;width: 260px;">日期：{{orderInfo.deadline}}</td>
+          <td style="padding: 10px;width: 260px;">客户：{{orderMsg.customName}}</td>
+          <td style="padding: 10px;width: 260px;">单号：{{orderMsg.orderSn}}</td>
+          <td style="padding: 10px;width: 260px;">日期：{{orderMsg.deadline}}</td>
         </tr>
       </table>
       <table border="1" width="780" style="border:solid 1px black;border-collapse:collapse">
@@ -114,7 +127,7 @@
           <td style="padding: 10px;width: 100px;text-align: center;">金额</td>
           <td style="padding: 10px;width: 100px;text-align: center;">备注</td>
         </tr>
-        <tr v-for="(res,i) in orderInfo.product">
+        <tr v-for="(res,i) in orderMsg.product">
           <td style="padding: 10px;width: 100px;text-align: center;">{{ i+1 }}</td>
           <td style="padding: 10px;width: 100px;text-align: center;">{{ res.name }}</td>
           <td style="padding: 10px;width: 100px;text-align: center;">扎/支</td>
@@ -125,25 +138,25 @@
           <td style="padding: 10px;width: 100px;text-align: center;"></td>
         </tr>
         <tr>
-          <td style="padding: 10px;width: 100px;" colspan="2">合计：{{orderInfo.actPrice}}</td>
-          <td style="padding: 10px;width: 100px;" colspan="2">实收：{{orderInfo.debt==0?orderInfo.actPrice:'0.00'}}</td>
-          <td style="padding: 10px;width: 100px;" colspan="2">欠款：{{orderInfo.debt==1?orderInfo.actPrice:'0.00'}}</td>
+          <td style="padding: 10px;width: 100px;" colspan="2">合计：{{orderMsg.actPrice}}</td>
+          <td style="padding: 10px;width: 100px;" colspan="2">实收：{{orderMsg.debt==0?orderMsg.actPrice:'0.00'}}</td>
+          <td style="padding: 10px;width: 100px;" colspan="2">欠款：{{orderMsg.debt==1?orderMsg.actPrice:'0.00'}}</td>
           <td style="padding: 10px;width: 100px;"></td>
         </tr>
         <tr>
           <td style="padding: 10px;width: 100px;">其他说明：</td>
-          <td style="padding: 10px;width: 100px;" colspan="6">{{orderInfo.remark}}</td>
+          <td style="padding: 10px;width: 100px;" colspan="6">{{orderMsg.remark}}</td>
         </tr>
       </table>
       <table border="0" width="780" style="border:solid 1px #fff;border-collapse:collapse">
         <tr >
-          <td style="padding: 10px;width: 260px;">开单：{{orderInfo.shopAdminName}}</td>
+          <td style="padding: 10px;width: 260px;">开单：{{orderMsg.shopAdminName}}</td>
           <td style="padding: 10px;width: 260px;">配送：</td>
           <td style="padding: 10px;width: 260px;">打印时间：{{todays(1)}}</td>
         </tr>
       </table>
     </div>
-	</div>
+  </div>
 </template>
 
 <script>
@@ -151,50 +164,50 @@ import SelOrder from './components/sel-order';
 import OrderDetail from './components/order-detail';
 import { getLodop } from '@/utils/lodop';
 export default {
-	components: {
-		SelOrder,
-		OrderDetail
-	},
-	data() {
-		return {
-			// x-crud
-			app: null,
-			tabIndex: '0',
-			tabsData: [
-				{
-					text: '全部',
-					key: '0',
-					val: 0
-				},
-				{
-					text: '待付款',
-					key: '1',
-					val: 0
-				},
-				{
-					text: '待配送',
-					key: '2',
-					val: 0
-				},
-				{
-					text: '配送中',
-					key: '3',
-					val: 0
-				},
-				{
-					text: '已完成',
-					key: '4',
-					val: 0
-				}
-			],
-			optionData: {},
-      orderInfo:'',
-		};
-	},
-	created() {
-		this.init();
-	},
-	methods: {
+  components: {
+    SelOrder,
+    OrderDetail
+  },
+  data() {
+    return {
+      // x-crud
+      app: null,
+      tabIndex: '0',
+      tabsData: [
+        {
+          text: '全部',
+          key: '0',
+          val: 0
+        },
+        {
+          text: '待付款',
+          key: '1',
+          val: 0
+        },
+        {
+          text: '待配送',
+          key: '2',
+          val: 0
+        },
+        {
+          text: '配送中',
+          key: '3',
+          val: 0
+        },
+        {
+          text: '已完成',
+          key: '4',
+          val: 0
+        }
+      ],
+      optionData: {},
+      orderMsg:'',
+    };
+  },
+  created() {
+    this.init();
+  },
+  methods: {
     todays(type) {
       var myDate = new Date();
       let todaty = '';
@@ -209,16 +222,16 @@ export default {
       }
       return todaty
     },
-		formatProgress(){
-			return ''
-		},
-		init() {
-			this.$store.dispatch('getCategory');
-			this.$store.dispatch('getUsage');
-		},
+    formatProgress(){
+      return ''
+    },
+    init() {
+      // this.$store.dispatch('getCategory');
+      this.$store.dispatch('getUsage');
+    },
     printOrder(e){
       this.$service.order.info({ id: e.id }).then(res => {
-        this.orderInfo = res;
+        this.orderMsg = res;
         this.$nextTick(() => {
           let LODOP = getLodop();
 
@@ -240,177 +253,174 @@ export default {
         });
       });
     },
-		//取消自取
-		selfGetCancel(id) {
-			this.$refs[`popover-` + id][1].doClose();
-		},
-		noSendShipFn(item) {
-			this.$refs[`popover-` + item.id][1].doClose();
-
-			this.$service.order.freeShipping({ id: item.id }).then(res => {
-				this.$message.success('操作成功！');
-				item.currentFlow = 4;
-				item.status = '5';
-			});
-		},
-		//发货详情
-		shipDrawFn(item) {
-			this.optionData = item;
-			setTimeout(() => {
-				this.$refs.selOrder.init();
-			});
-		},
-		//获取订单详情
-		detailShowFn(item) {
-			this.optionData = item;
-			setTimeout(() => {
-				this.$refs.orderDetail.init();
-			});
-		},
-		handleClick(tab, e) {
-			this.app.refresh({ status: this.tabIndex });
-		},
-		onLoad({ ctx, app }) {
-			this.app = app;
+    //取消自取
+    selfGetCancel(id) {
+      this.$refs[`popover-` + id][1].doClose();
+    },
+    noSendShipFn(item) {
+      this.$refs[`popover-` + item.id][1].doClose();
+      this.$service.order.freeShipping({ id: item.id }).then(res => {
+        this.$message.success('操作成功！');
+        item.buttonList.forEach((ele)=>{
+          if(ele.type=='selfGet'){
+            console.log(ele)
+            ele.disable = 1
+          }
+        })
+      });
+    },
+    //发货详情
+    shipDrawFn(item) {
+      this.optionData = item;
+      setTimeout(() => {
+        this.$refs.selOrder.init();
+      });
+    },
+    //获取订单详情
+    detailShowFn(item) {
+      this.optionData = item;
+      setTimeout(() => {
+        this.$refs.orderDetail.init();
+      });
+    },
+    handleClick(tab, e) {
+      this.app.refresh({ status: this.tabIndex });
+    },
+    onLoad({ ctx, app }) {
+      this.app = app;
 
-			//传入参数 shish 2020.5.9
-			if(this.$route.query.status){
-				this.tabIndex = this.$route.query.status
-			}
+      //传入参数 shish 2020.5.9
+      if(this.$route.query.status){
+        this.tabIndex = this.$route.query.status
+      }
 
-			ctx.service(this.$service.order)
-				.set('table', {
-					columns: [
-						{
-							prop: 'orderSn',
-							label: '单号',
-							align: 'center',
-							width: '160'
-						},
-						{
-							prop: 'sendCost',
-							label: '运费',
-							align: 'center',
-							width: '80'
-						},
-						{
-							prop: 'prePrice',
-							label: '总价',
-							align: 'center',
-							width: '110'
-						},
-						{
-							prop: 'actPrice',
-							label: '实付款',
-							align: 'center',
-							emptyText: '无',
-							width: '110'
-						},
-						{
-							prop: 'customName',
-							label: '客户',
-							align: 'center',
-							width: '160'
-						},
-						{
-							prop: 'customMobile',
-							label: '手机号',
-							align: 'center',
-							width: '130'
-						},
-						{
-							prop: 'bigNum',
-							label: '数量',
-							align: 'center',
-							width: '90'
-						},
-						{
-							prop: 'sendTypeName',
-							label: '配送方式',
-							align: 'center',
-							width: '90'
-						},
-						{
-							prop: 'reachTime',
-							label: '送达时间',
-							align: 'center',
-							width: 120
-						},
-						{
-							prop: 'sendNum',
-							label: '编号',
-							align: 'center',
-							width: 110
-						},
-						{
-							prop: 'status',
-							label: '状态',
-							align: 'center',
-							width: 110
-						},
-						{
-							prop: 'shopAdminName',
-							label: '开单人',
-							align: 'center',
-							width: 110
-						}
-					],
+      ctx.service(this.$service.order)
+          .set('table', {
+            columns: [
+              {
+                prop: 'orderSn',
+                label: '单号',
+                align: 'center',
+                width: '160'
+              },
+              {
+                prop: 'prePrice',
+                label: '总价',
+                align: 'center',
+                width: '110'
+              },
+              {
+                prop: 'actPrice',
+                label: '实付款',
+                align: 'center',
+                emptyText: '无',
+                width: '110'
+              },
+              {
+                prop: 'customName',
+                label: '客户',
+                align: 'center',
+                width: '150'
+              },
+              {
+                prop: 'customMobile',
+                label: '手机号',
+                align: 'center',
+                width: '120'
+              },
+              {
+                prop: 'bigNum',
+                label: '数量',
+                align: 'center',
+                width: '150'
+              },
+              {
+                prop: 'sendTypeName',
+                label: '配送方式',
+                align: 'center',
+                width: '150'
+              },
+              {
+                prop: 'reachTime',
+                label: '送达时间',
+                align: 'center',
+                width: 120
+              },
+              {
+                prop: 'sendNum',
+                label: '编号',
+                align: 'center',
+                width: 110
+              },
+              {
+                prop: 'status',
+                label: '状态',
+                align: 'center',
+                width: 110
+              },
+              {
+                prop: 'shopAdminName',
+                label: '开单人',
+                align: 'center',
+                width: 110
+              }
+            ],
 
-					props: {
-						'default-sort': {
-							prop: 'createTime',
-							order: 'descending'
-						}
-					},
-					op: {
-						visible: true, // 是否显示
-						// 同 element-ui Table-column Attributes
-						props: {
-							width: 220,
-							align: 'center',
-							fixed: 'right',
-							label: '操作'
-						},
-						// 布局，请移步 `layout`
-						layout: ['slot-column-option']
-					}
-				})
-				.set('search', {
-					key: { placeholder: '订单号 / 姓名，支持拼音首字母搜索' }
-				})
-				.set('layout', [
-					['slot-tabs'],
-					['search-key'],
-					['data-table'],
-					['flex1', 'pagination']
-				])
-				.on('refresh', async (params, { next }) => {
-					// 继续执行刷新
-					let  res  = await next(params);
-					this.tabsData[0].val = res.shop.totalOrder;
-					this.tabsData[1].val = res.shop.unPayOrder;
-					this.tabsData[2].val = res.shop.unSendOrder;
-					this.tabsData[3].val = res.shop.sendingOrder;
-					this.tabsData[4].val = res.shop.finishOrder;
-				})
-				.done();
-			app.refresh({ status: this.tabIndex });
-		},
-		onSongSuccess() {
-			this.app.refresh();
-		}
-	}
+            props: {
+              'default-sort': {
+                prop: 'createTime',
+                order: 'descending'
+              }
+            },
+            op: {
+              visible: true, // 是否显示
+              // 同 element-ui Table-column Attributes
+              props: {
+                width: 220,
+                align: 'center',
+                fixed: 'right',
+                label: '操作'
+              },
+              // 布局，请移步 `layout`
+              layout: ['slot-column-option']
+            }
+          })
+          .set('search', {
+            key: { placeholder: '订单号 / 姓名，支持拼音首字母搜索' }
+          })
+          .set('layout', [
+            ['slot-tabs'],
+            ['search-key'],
+            ['data-table'],
+            ['flex1', 'pagination']
+          ])
+          .on('refresh', async (params, { next }) => {
+            // 继续执行刷新
+            let  asset  = await next(params);
+            this.tabsData[0].val = asset.allNum;
+            this.tabsData[1].val = asset.unPayNum;
+            this.tabsData[2].val = asset.unSendNum;
+            this.tabsData[3].val = asset.sendingNum;
+            this.tabsData[4].val = asset.finishNum;
+          })
+          .done();
+      app.refresh({ status: this.tabIndex });
+    },
+    onSongSuccess() {
+      this.app.refresh();
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
 .book-wrap {
-	@include disFlex(center, flex-start);
-	& > div {
-		margin-left: 6px;
-		&:first-child {
-			margin-left: 0;
-		}
-	}
+  @include disFlex(center, flex-start);
+  & > div {
+    margin-left: 6px;
+    &:first-child {
+      margin-left: 0;
+    }
+  }
 }
 .print-html-box {
   position: fixed;
@@ -418,53 +428,53 @@ export default {
   top: 9990px;
 }
 .steps-wrap {
-	width: 150px;
-	//height: 26px;
-	margin: 0 auto;
+  width: 150px;
+  //height: 26px;
+  margin: 0 auto;
 }
 </style>
 
 <style lang="scss">
 .order-list-wrap {
-	.el-step__head.is-process {
-		color: #c0c4cc;
-		border-color: #c0c4cc;
-		.el-step__icon.is-text {
-			background-color: #c0c4cc;
-		}
-	}
-	.el-step__head.is-success {
-		color: #409eff;
-		border-color: #409eff;
-		.el-step__icon.is-text {
-			background-color: #409eff;
-			font-size: 1px;
-		}
-		.el-step__line {
-			background-color: #409eff;
-			.el-step__line-inner {
-				display: inline-block;
-			}
-		}
-	}
-	.el-step__head.is-wait {
-		.el-step__icon.is-text {
-			background-color: #c0c4cc;
-		}
-	}
-	.el-step__icon-inner {
-		font-size: 1px;
-		display: none;
-	}
-	.el-step__icon {
-		width: 10px;
-		height: 10px;
-	}
-	.el-step.is-horizontal .el-step__line {
-		height: 1px;
-		left: 16px;
-		right: -16px;
-		top: 9px;
-	}
+  .el-step__head.is-process {
+    color: #c0c4cc;
+    border-color: #c0c4cc;
+    .el-step__icon.is-text {
+      background-color: #c0c4cc;
+    }
+  }
+  .el-step__head.is-success {
+    color: #409eff;
+    border-color: #409eff;
+    .el-step__icon.is-text {
+      background-color: #409eff;
+      font-size: 1px;
+    }
+    .el-step__line {
+      background-color: #409eff;
+      .el-step__line-inner {
+        display: inline-block;
+      }
+    }
+  }
+  .el-step__head.is-wait {
+    .el-step__icon.is-text {
+      background-color: #c0c4cc;
+    }
+  }
+  .el-step__icon-inner {
+    font-size: 1px;
+    display: none;
+  }
+  .el-step__icon {
+    width: 10px;
+    height: 10px;
+  }
+  .el-step.is-horizontal .el-step__line {
+    height: 1px;
+    left: 16px;
+    right: -16px;
+    top: 9px;
+  }
 }
 </style>

hdApp/src/mixins/globalMixins.js

@@ -80,7 +80,7 @@ export default {
 
 	},
 	onShow(){
-		if (isLogin()) {
+		if (isLogin()&&!this.$util.isEmpty(this.getLoginInfo)) {
 			if (this.init) {
 				this.init()
       }

mallApp/src/pages/pay/index.vue

@@ -146,7 +146,6 @@
 					this.tabIndex = parseInt(this.option.pageType)
 				}
 				getOrderShop().then(res => {
-				  console.log(res,'getOrderShop')
 					this.inpFocus = true
 					uni.setNavigationBarTitle({
 						title: `您正在向【${res.shop.merchantName} ${res.shop.shopName}】付款`