增加核销功能,修改无法砍价的问题

api/order.js

@@ -136,9 +136,9 @@ export function payOrder(uni, paytype, from) {
  * 订单核销
  * @returns {*}
  */
-export function orderVerific(verify_code, is_confirm) {
+export function orderVerific(verifyCode, orderVerific) {
 	return request.post("order/order_verific", {
-		verify_code,
+		verifyCode,
-		is_confirm
+		orderVerific
 	});
 }

assets/css/style.less

@@ -4414,6 +4414,8 @@ page {
 .bargain .wrapper .pictxt .pictrue {
   width: 1.8*100rpx;
   height: 1.8*100rpx;
+  position: relative;
+  
 }
 
 .bargain .wrapper .pictxt .pictrue image {
@@ -4484,7 +4486,7 @@ page {
   font-size: 0.3*100rpx;
   font-weight: bold;
   color: #fff;
-  width: 6*100rpx;
+  width: 100%;
   height: 0.8*100rpx;
   border-radius: 0.4*100rpx;
   background-image: linear-gradient(to right, #f67a38 0%, #f11b09 100%);

pages/activity/DargainDetails/index.vue

@@ -369,8 +369,7 @@ export default {
       var that = this;
       getBargainDetail(that.bargainId)
         .then(res => {
-          that.$set(that, "bargain", res.data.bargain);
+          that.bargain = res.data.bargain;
-          that.updateTitle();
           that.datatime = that.bargain.stopTime;
           that.getBargainHelpCount();
         })
@@ -503,9 +502,16 @@ export default {
       })
         .then(() => {})
         .catch(() => {
-          // that.$yrouter.push({
+          this.$yrouter.push({
-          //   path: "/pages/activity/DargainDetails/index",
+            path: "/pages/activity/DargainDetails/index",
-          //   query: { id: that.bargainId, partake: that.userInfo.uid }
+            query: { id: that.bargainId, partake: that.userInfo.uid }
+          });
+          // that.$router.push({
+          //   path:
+          //     "/activity/dargain_detail/" +
+          //     that.bargainId +
+          //     "/" +
+          //     that.userInfo.uid
           // });
         });
     },
@@ -522,6 +528,7 @@ export default {
           that.alreadyPrice = res.data.alreadyPrice;
           that.pricePercent = res.data.pricePercent;
           that.price = (that.bargain.price - that.alreadyPrice).toFixed(2);
+          console.log(that);
         })
         .catch(() => {
           that.bargainPartake = that.userInfo.uid;
@@ -566,31 +573,32 @@ page {
   background-color: #00c17b;
 }
 .bargainBnt_hui {
-  font-size: 0.3rem;
+  font-size: 0.3*100rpx;
   font-weight: bold;
   color: #fff;
-  width: 6rem;
+  width: 6*100rpx;
-  height: 0.8rem;
+  height: 0.8*100rpx;
-  border-radius: 0.4rem;
+  border-radius: 0.4*100rpx;
   background: #bbb;
   text-align: center;
-  line-height: 0.8rem;
+  line-height: 0.8*100rpx;
-  margin-top: 0.32rem;
+  margin-top: 0.32*100rpx;
 }
 .bargain_view {
-  width: 1.8rem;
+  left:0;
-  height: 0.48rem;
+  right:0;
+  height: 0.48*100rpx;
   background: rgba(0, 0, 0, 0.5);
   opacity: 1;
-  border-radius: 0 0 0.06rem 0.06rem;
+  border-radius: 0 0 0.06*100rpx 0.06*100rpx;
   position: absolute;
   bottom: 0;
-  font-size: 0.22rem;
+  font-size: 0.22*100rpx;
   color: #fff;
   text-align: center;
-  line-height: 0.48rem;
+  line-height: 0.48*100rpx;
 }
 .iconfonts {
-  font-size: 0.22rem;
+  font-size: 0.22*100rpx;
 }
 </style>

pages/activity/Poster/index.vue

@@ -8,12 +8,6 @@
     </view>
   </view>
 </template>
-<style scoped lang="less">
-.poster-poster {
-  height: unset !important;
-}
-</style>
-
 <script>
 import { getBargainPoster, getCombinationPoster } from "@/api/activity";
 
@@ -74,3 +68,12 @@ export default {
   }
 };
 </script>
+
+<style scoped lang="less">
+page {
+  background-color: #00c17b;
+}
+.poster-poster {
+  height: unset !important;
+}
+</style>

pages/orderAdmin/OrderCancellation/index.vue

@@ -88,9 +88,22 @@ export default {
           uni.hideLoading();
           this.orderInfo = res.data;
           this.iShidden = false;
+          uni.showToast({
+            title: res.msg,
+            icon: "success",
+            duration: 2000
+          });
         })
-        .catch(() => {
+        .catch(error => {
           uni.hideLoading();
+          uni.showToast({
+            title:
+              error.msg ||
+              error.response.data.msg ||
+              error.response.data.message,
+            icon: "none",
+            duration: 2000
+          });
         });
     },
     openQRCode: function() {
@@ -109,7 +122,6 @@ export default {
   image {
     width: 100%;
     height: 3 * 100rpx;
-    
   }
 }
 

pages/user/User/index.vue

@@ -121,7 +121,6 @@
                 class="item"
                 :key="MyMenusIndex"
                 @click="goPages(MyMenusIndex)"
-                v-if="item.url&&item.id!='230'"
               >
                 <view class="pictrue">
                   <image :src="item.pic" />

pages/user/UserAccount/index.vue

@@ -8,7 +8,7 @@
               <view>总资产(元)</view>
               <view class="money">{{ now_money }}</view>
             </view>
-            <navigator url="/pages/user/Recharge/index" class="recharge font-color-red">充值</navigator>
+            <!-- <navigator url="/pages/user/Recharge/index" class="recharge font-color-red">充值</navigator> -->
           </view>
           <view class="cumulative acea-row row-top">
             <view class="item">
@@ -31,12 +31,12 @@
           </view>
           <view>消费记录</view>
         </view>
-        <view class="item" @click="goUserBill(2)">
+        <!-- <view class="item" @click="goUserBill(2)">
           <view class="pictrue">
             <image src="@/static/images/record3.png" />
           </view>
           <view>充值记录</view>
-        </view>
+        </view> -->
       </view>
       <view class="advert acea-row row-between-wrapper"></view>
     </view>