shish 3 лет назад
Родитель
Сommit
42b3102ee0
2 измененных файлов с 8 добавлено и 7 удалено
  1. 4 4
      hdApp/src/pagesPurchase/order.vue
  2. 4 3
      hdApp/src/pagesPurchase/purDetails.vue

+ 4 - 4
hdApp/src/pagesPurchase/order.vue

@@ -13,8 +13,8 @@
             <view :class="[ghsInfo.isOpen == 0 ? 'cg-button-rest' : 'cg-button']" @click="enterShop(ghsInfo)">买花</view>
             <view :class="[ghsInfo.isOpen == 0 ? 'cg-button-rest' : 'cg-button']" @click="enterShop(ghsInfo)">买花</view>
 
 
             <view class="store_btn">
             <view class="store_btn">
-              <view class="btn_entrance" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})">结账记录</view>
               <view class="btn_entrance" @click="pageTo({url:'/pagesPurchase/shopping'})" > 买花记录 </view>
               <view class="btn_entrance" @click="pageTo({url:'/pagesPurchase/shopping'})" > 买花记录 </view>
+              <view class="btn_entrance" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})">结账记录</view>
               <view class="btn_entrance" style="color:red;font-weight:bold;" @click="settleAccounts(ghsInfo)">待结订单 </view>
               <view class="btn_entrance" style="color:red;font-weight:bold;" @click="settleAccounts(ghsInfo)">待结订单 </view>
               <view class="btn_entrance" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})">欠款变动明细</view>
               <view class="btn_entrance" @click="pageTo({ url: '/admin/ghs/debtChange?ghsId='+ghsInfo.id})">欠款变动明细</view>
             </view>
             </view>
@@ -161,7 +161,7 @@ export default {
           padding: 20upx 40upx;
           padding: 20upx 40upx;
           position: absolute;
           position: absolute;
           top:56upx;
           top:56upx;
-          right:90upx;
+          right:60upx;
           background: #3385FF;
           background: #3385FF;
       }
       }
       .cg-button-rest{
       .cg-button-rest{
@@ -174,7 +174,7 @@ export default {
           padding: 20upx 40upx;
           padding: 20upx 40upx;
           position: absolute;
           position: absolute;
           top:56upx;
           top:56upx;
-          right:90upx;
+          right:60upx;
           background: #CCCCCC;
           background: #CCCCCC;
       }
       }
       .book-button{
       .book-button{
@@ -227,7 +227,7 @@ export default {
         & > .store_title {
         & > .store_title {
           margin-bottom: 58upx;
           margin-bottom: 58upx;
           margin-left:10upx;
           margin-left:10upx;
-          width: 400upx;
+          width: 486upx;
           white-space: nowrap;
           white-space: nowrap;
           text-overflow: ellipsis;
           text-overflow: ellipsis;
           overflow: hidden;
           overflow: hidden;

+ 4 - 3
hdApp/src/pagesPurchase/purDetails.vue

@@ -215,15 +215,13 @@
         <button class="admin-button-com blue big" @click="toPay">去付款</button>
         <button class="admin-button-com blue big" @click="toPay">去付款</button>
       </block>
       </block>
       <block v-else>
       <block v-else>
-        <button class="admin-button-com blue big" v-if="detailInfo.debt == 1">付款结清</button>
+        <button class="admin-button-com blue big" @click="clearOrder" v-if="detailInfo.debt == 1">付款</button>
       </block>
       </block>
 
 
 		</view>
 		</view>
   </view>
   </view>
 </template>
 </template>
-
 <script>
 <script>
-
 import { purchaseDetail, purchaseDebtPay } from "@/api/purchase";
 import { purchaseDetail, purchaseDebtPay } from "@/api/purchase";
 import TuiListCell from "@/components/plugin/list-cell";
 import TuiListCell from "@/components/plugin/list-cell";
 export default {
 export default {
@@ -261,6 +259,9 @@ export default {
 			})
 			})
 		},
 		},
   methods: {
   methods: {
+    clearOrder(){
+
+    },
 		navigate(latitude, longitude, address) {   
 		navigate(latitude, longitude, address) {   
 			// 将经纬度转换成Number
 			// 将经纬度转换成Number
 			let latituded = Number(latitude);
 			let latituded = Number(latitude);