123456

api/user.js

@@ -213,4 +213,13 @@ export function version(data) {
 		method: 'get',
 		data
 	})
+}
+
+//订单核销
+export function check(data) {
+	return request({
+		url: '/api/order/order_verific',
+		method: 'post',
+		data
+	});
 }

pages/order/createOrder.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
-		<!-- <view class="navbar">
+		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item"
 				:class="{ current: tabCurrentIndex === item.state }" @click="tabClick(item.state)">{{ item.text }}
 			</view>
-		</view> -->
+		</view>
 
 		<!-- 地址 -->
 		<navigator v-if="tabCurrentIndex == 0" class="address-section" url="/pages/set/address?source=1">
@@ -31,7 +31,7 @@
 		</navigator>
 		<view v-if="tabCurrentIndex == 1" class="address-section">
 			<view id="list-box">
-				<view class="chose">
+				<view class="chose" v-if="!checkedPoint">
 					<view class="title">选择门店</view>
 					<view class="chose-name" @click.stop="selectPoint" v-if="tabCurrentIndex == 1">
 						选择门店
@@ -41,7 +41,7 @@
 					</view>
 				</view>
 				<view class="stores-wrapper" v-if="checkedPoint && checkedPoint.name">
-					<view class="store">
+					<view class="store" @click.stop="selectPoint">
 						<view class="store-logo">
 							<image :src="checkedPoint.image" mode=""></image>
 							<text class="store-name clamp">{{ checkedPoint.name }}</text>

pages/order/orderDetail.vue

@@ -13,6 +13,9 @@
 				background="#ffffff" foreground="#333333" pdground="#333333" :iconSize="40" :lv="3" :onval="true"
 				:loadMake="true" :usingComponents="true" :showLoading="true" loadingText="二维码生成中" />
 		</view>
+		<view class="row b-b b-t" v-if="item.shipping_type == 2 && item.status == 0">
+			<text class="order-status">可核销次数：{{ item.frequency }}</text>
+		</view>
 		<!-- 快递信息 -->
 		<view class="express-box" @click="expressCheck(item)" v-if="item.delivery_id != null ">
 			<view v-if='item.delivery_id != null' style="width: 100%;padding: 10rpx 20rpx;background: #FFFFFF;">

pages/product/product.vue

@@ -78,7 +78,7 @@
 				</view>
 				<view class="buy-now">
 					<button type="primary" class=" action-btn no-border buy-now-btn" @click.stop="toggleSpec(2)"
-						v-if="isjf==0 && isbd == 0">加入购物车</button>
+						v-if="isjf==0 ">加入购物车</button>
 					<button type="primary" class=" action-btn no-border  add-cart-btn"
 						@click.stop="toggleSpec(1)">立即购买</button>
 				</view>

pages/set/userinfo.vue

@@ -18,7 +18,7 @@
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="row b-b flex jg">
 			<text class="tit">头像</text>
-			<image :src="userInfo.avatar" @click.stop="imgsub"></image>
+			<image class="avatar" :src="userInfo.avatar" @click.stop="imgsub"></image>
 		</view>
 		<view class="row b-b flex">
 			<text class="tit">昵称</text>
@@ -244,6 +244,7 @@
 		.avatar {
 			width: 80rpx;
 			height: 80rpx;
+			border-radius: 50%;
 			position: relative;
 			z-index: 2;
 		}

pages/user/user.vue

@@ -96,6 +96,15 @@
 				</view>
 				<image src="../../static/icon/back.png" mode="heightFix" class="right-img"></image>
 			</view>
+			<view class="user-list flex" @click="sao()" v-if="userInfo.adminid">
+				<view class="user-list-image">
+					<image src="../../static/icon/u6.png" mode="heightFix" class="left-img"></image>
+				</view>
+				<view class="user-list-tit">
+					扫码核销
+				</view>
+				<image src="../../static/icon/back.png" mode="heightFix" class="right-img"></image>
+			</view>
 		</view>
 		<view class="" style="height: 20rpx;">
 		</view>
@@ -117,6 +126,22 @@
 				</view>
 			</view>
 		</uni-popup>
+		<uni-popup ref="popuphx" class="agree-wrapper">
+			<view class="hx-wrapper">
+				<view class="hx-img">
+					<image src="../../static/img/hxbg.png" mode=""></image>
+				</view>
+				<view class="hx-body">
+					<view class="hx-title">输入核销码核销</view>
+					<input type="text" v-model="code" placeholder="请输入核销码" placeholder-class="hx-placeholder" />
+					<input type="number" v-model="num" placeholder="请输入核销数量" placeholder-class="hx-placeholder" />
+					<view class="hx-btn" @click="qhx">立即核销</view>
+				</view>
+				<view class="hx-close" @click="close">
+					<image src="../../static/icon/close.png" mode=""></image>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 <script>
@@ -150,6 +175,7 @@
 				store_name: '',
 				achievement: '',
 				code: '',
+				num: '',
 				text: 'sy13967626944' //客服微信
 			};
 		},
@@ -193,19 +219,25 @@
 			qhx() {
 				check({
 						verify_code: this.code,
+						frequency: this.num,
 						is_confirm: 1 //1是核销，0是查看
 					})
 					.then(e => {
 						this.$api.msg('核销成功');
 						this.close();
+						this.code = '';
+						this.num = '';
 					})
 					.catch(e => {
+						this.code = '';
+						this.num = '';
 						console.log(e);
 					});
 			},
 			sao() {
 				let obj = this;
-
+				// console.log(111);
+				// obj.$refs.popuphx.open();
 				// #ifndef H5
 				uni.scanCode({
 					success(e) {
@@ -663,7 +695,7 @@
 
 	.hx-wrapper {
 		width: 536rpx;
-		height: 630rpx;
+		height: 720rpx;
 		position: relative;
 
 		// background-color: #fff;
@@ -692,7 +724,7 @@
 
 		.hx-body {
 			width: 536rpx;
-			height: 349rpx;
+			height: 450rpx;
 			background-color: #fff;
 			border-radius: 0 0 10rpx 10rpx;
 

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1117,8 +1117,8 @@ function populateParameters(result) {
     appVersion: "1.0.0",
     appVersionCode: "100",
     appLanguage: getAppLanguage(hostLanguage),
-    uniCompileVersion: "3.8.7",
-    uniRuntimeVersion: "3.8.7",
+    uniCompileVersion: "3.8.12",
+    uniRuntimeVersion: "3.8.12",
     uniPlatform: undefined || "mp-weixin",
     deviceBrand: deviceBrand,
     deviceModel: model,
@@ -1894,7 +1894,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"芯悦澜","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"芯悦澜","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -5839,7 +5839,7 @@ var debugs = {};
 var debugEnviron;
 exports.debuglog = function(set) {
   if (isUndefined(debugEnviron))
-    debugEnviron = Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"芯悦澜","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).NODE_DEBUG || '';
+    debugEnviron = Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"芯悦澜","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).NODE_DEBUG || '';
   set = set.toUpperCase();
   if (!debugs[set]) {
     if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
@@ -12419,7 +12419,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"芯悦澜","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"芯悦澜","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -12440,14 +12440,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"芯悦澜","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"芯悦澜","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"芯悦澜","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"芯悦澜","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -12543,7 +12543,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"芯悦澜","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"芯悦澜","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -17787,6 +17787,7 @@ exports.addressDel = addressDel;
 exports.addressEdit = addressEdit;
 exports.article = article;
 exports.cartDel = cartDel;
+exports.check = check;
 exports.delcollect = delcollect;
 exports.details = details;
 exports.getAddressList = getAddressList;
@@ -18020,6 +18021,15 @@ function version(data) {
   });
 }
 
+//订单核销
+function check(data) {
+  return (0, _request.default)({
+    url: '/api/order/order_verific',
+    method: 'post',
+    data: data
+  });
+}
+
 /***/ }),
 
 /***/ 5:

unpackage/dist/dev/mp-weixin/components/uni-load-more/uni-load-more.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/components/uni-number-box.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/index/index.wxml

@@ -1 +1 @@
-<view class="container"><swiper class="top-swiper" autoplay="true" duration="400" interval="5000" indicator-dots="{{true}}" indicator-active-color="#ea3855" data-event-opts="{{[['change',[['swiperChange',['$event']]]]]}}" bindchange="__e"><block wx:for="{{carouselList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['bannerNavToUrl',['$0'],[[['carouselList','',index]]]]]]]}}" class="carousel-item" bindtap="__e"><image src="{{item.pic}}"></image></swiper-item></block></swiper><view class="jg"></view><view class="good-list"><block wx:for="{{goodList}}" wx:for-item="item" wx:for-index="__i0__"><view data-event-opts="{{[['tap',[['navTo',['/pages/product/product?id='+item.id]]]]]}}" class="good" bindtap="__e"><image src="{{item.image}}" mode></image></view></block></view><view class="jg"></view><block wx:if="{{$root.g0!=0}}"><view class="art-box flex"><block wx:for="{{shopList}}" wx:for-item="item" wx:for-index="__i1__"><view data-event-opts="{{[['tap',[['navTo',['/pages/product/product?id='+item.id]]]]]}}" class="art-item" bindtap="__e"><image src="{{item.image}}" mode></image></view></block></view></block><block wx:if="{{$root.g1!=0}}"><view class="jg"></view></block><view class="good-list"><view class="good"><image src="https://xyl.liuniukj.com/computent.png" data-event-opts="{{[['tap',[['navTo',['/pages/index/artDetail?id=1']]]]]}}" bindtap="__e"></image></view><view class="good"><image src="https://xyl.liuniukj.com/product.png" data-event-opts="{{[['tap',[['navTo',['/pages/index/artDetail?id=3']]]]]}}" bindtap="__e"></image></view></view></view>
+<view class="container"><swiper class="top-swiper" autoplay="true" duration="400" interval="5000" indicator-dots="{{true}}" indicator-active-color="#ea3855" data-event-opts="{{[['change',[['swiperChange',['$event']]]]]}}" bindchange="__e"><block wx:for="{{carouselList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['bannerNavToUrl',['$0'],[[['carouselList','',index]]]]]]]}}" class="carousel-item" bindtap="__e"><image src="{{item.pic}}"></image></swiper-item></block></swiper><view class="jg"></view><view class="good-list"><block wx:for="{{goodList}}" wx:for-item="item" wx:for-index="__i0__"><view data-event-opts="{{[['tap',[['navTo',['/pages/product/product?id='+item.id+'&isjf=1']]]]]}}" class="good" bindtap="__e"><image src="{{item.image}}" mode></image></view></block></view><view class="jg"></view><block wx:if="{{$root.g0!=0}}"><view class="art-box flex"><block wx:for="{{shopList}}" wx:for-item="item" wx:for-index="__i1__"><view data-event-opts="{{[['tap',[['navTo',['/pages/product/product?id='+item.id+'&isjf=1']]]]]}}" class="art-item" bindtap="__e"><image src="{{item.image}}" mode></image></view></block></view></block><block wx:if="{{$root.g1!=0}}"><view class="jg"></view></block><view class="good-list"><view class="good"><image src="https://xyl.liuniukj.com/computent.png" data-event-opts="{{[['tap',[['navTo',['/pages/index/artDetail?id=1']]]]]}}" bindtap="__e"></image></view><view class="good"><image src="https://xyl.liuniukj.com/product.png" data-event-opts="{{[['tap',[['navTo',['/pages/index/artDetail?id=3']]]]]}}" bindtap="__e"></image></view></view></view>

unpackage/dist/dev/mp-weixin/pages/order/orderDetail.js

@@ -347,6 +347,9 @@ var _order = __webpack_require__(/*! @/api/order.js */ 222);
 //
 //
 //
+//
+//
+//
 var _default = {
   filters: {
     orderType: function orderType(item) {

unpackage/dist/dev/mp-weixin/pages/set/userinfo.wxss

@@ -47,6 +47,7 @@
 .row .avatar {
   width: 80rpx;
   height: 80rpx;
+  border-radius: 50%;
   position: relative;
   z-index: 2;
 }

unpackage/dist/dev/mp-weixin/pages/user/user.js

@@ -197,6 +197,7 @@ var _default = {
       store_name: '',
       achievement: '',
       code: '',
+      num: '',
       text: 'sy13967626944' //客服微信
     };
   },
@@ -234,16 +235,24 @@ var _default = {
       var _this2 = this;
       (0, _user.check)({
         verify_code: this.code,
+        frequency: this.num,
         is_confirm: 1 //1是核销，0是查看
       }).then(function (e) {
         _this2.$api.msg('核销成功');
         _this2.close();
+        _this2.code = '';
+        _this2.num = '';
       }).catch(function (e) {
+        _this2.code = '';
+        _this2.num = '';
         console.log(e);
       });
     },
     sao: function sao() {
       var obj = this;
+      // console.log(111);
+      // obj.$refs.popuphx.open();
+
       uni.scanCode({
         success: function success(e) {
           obj.code = e.result;

unpackage/dist/dev/mp-weixin/pages/user/user.wxss

@@ -262,7 +262,7 @@ page {
 }
 .hx-wrapper {
   width: 536rpx;
-  height: 630rpx;
+  height: 720rpx;
   position: relative;
 }
 .hx-wrapper .hx-img {
@@ -286,7 +286,7 @@ page {
 }
 .hx-wrapper .hx-body {
   width: 536rpx;
-  height: 349rpx;
+  height: 450rpx;
   background-color: #fff;
   border-radius: 0 0 10rpx 10rpx;
 }