5-6-1

manifest.json

@@ -2,8 +2,8 @@
     "name" : "精联惠选",
     "appid" : "__UNI__991D0D9",
     "description" : "精联惠选",
-    "versionName" : "1.2.5",
-    "versionCode" : 125,
+    "versionName" : "1.3.3",
+    "versionCode" : 133,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -127,7 +127,7 @@
             "proxy" : {
                 "/api" : {
                     "target" : "https://www.jlxnykj.cn/api",
-					// "target" : "http://7131.frp.qiniu1314.com/api",
+                    // "target" : "http://7131.frp.qiniu1314.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages/index/artList.vue

@@ -90,6 +90,7 @@
 			width: 160rpx;
 			height: 160rpx;
 			background-color: #eee;
+			flex-shrink: 0;
 		}
 		.content {
 			height: 160rpx;

pages/index/index.vue

@@ -31,7 +31,7 @@
 		<!-- 分类 ed -->
 		<!-- 公告 start -->
 		<view class="notice" v-if="list.length > 0">
-			<xzw-notice  theme="#ff5050" :list="list" @goItem="goItem" @goMore="goMore"/>
+			<xzw-notice  theme="#ff5050" :list="list" @goItem="goItem" @goMore="goMore" :direction="'row'"/>
 		</view>
 		
 		<!-- 公告 end -->

pages/money/pay.vue

@@ -20,7 +20,7 @@
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 2"></radio></label>
 			</view>
 			<!-- #endif -->
-			<view class="type-item" @click="changePayType(3)">
+			<view class="type-item" @click="changePayType(3)" v-if="is_zero==0">
 				<text class="icon iconfont iconyue"></text>
 				<view class="con">
 					<text class="tit">消费积分支付</text>
@@ -43,13 +43,8 @@ import weichatObj from '@/plugin/jweixin-module/index.js';
 export default {
 	data() {
 		return {
-			payType: 3, //支付类型
-			// #ifdef H5
-			payName: 'yue',
-			// #endif
-			// #ifdef MP-WEIXIN
-			payName: 'yue',
-			// #endif
+			payType: 2, //支付类型
+			payName: 'ali',
 			orderInfo: {},
 			money: 0.0, //订单金额
 			now_money: 0.0, //消费积分
@@ -60,7 +55,8 @@ export default {
 			// #ifdef H5
 			froms: '', //保存h5中数据来源对象
 			// #endif
-			pinkid: '' //保存拼团商品id
+			pinkid: '' ,//保存拼团商品id
+			is_zero: 0
 		};
 	},
 	computed: {
@@ -96,6 +92,9 @@ export default {
 			// 获取消费积分
 			this.now_money = data.now_money;
 		});
+		if(options.is_zero) {
+			this.is_zero = options.is_zero
+		}
 	},
 	methods: {
 		//选择支付方式
@@ -260,7 +259,7 @@ export default {
 			let prepage = obj.$api.prePage();
 
 			let data = {
-				is_zero: prepage.is_zero,
+				is_zero: obj.is_zero,
 				is_pack: prepage.is_pack,//是否礼包商品
 				real_name: prepage.addressData.real_name, //联系人名称
 				phone: prepage.addressData.phone, //联系人号码

pages/order/createOrder.vue

@@ -87,7 +87,7 @@
 					<view class="price-box">
 						<text
 							class="price">￥{{ ls.productInfo.attrInfo ? ls.productInfo.attrInfo.price : ls.productInfo.price }}</text>
-						<text class="number">{{ 'x ' + ls.cart_num + (ls.productInfo.unit_name || '') }}</text>
+						<text class="number">{{ 'x' + ls.cart_num  }} {{(ls.productInfo.unit_name ? '(' + ls.productInfo.unit_name + ')': '')}}</text>
 						<!-- <view><text class="price">￥{{lss.price}}</text></view> -->
 						<!-- <view class="number">
 							<uni-number-box class="step" :value="lss.number" :index="indx" @eventChange="numberChange"></uni-number-box>
@@ -472,6 +472,9 @@
 				if (this.pinkid) {
 					url += '&pinkid=' + this.pinkid
 				}
+				if(this.is_zero) {
+					url += '&is_zero=' + this.is_zero
+				}
 				uni.navigateTo({
 					url
 				});

pages/order/order.vue

@@ -190,7 +190,7 @@ export default {
 		// 订单支付
 		orderPay(e) {
 			uni.navigateTo({
-				url: '/pages/money/pay?type=1&ordid=' + e.order_id + '&money=' + e.pay_price
+				url: '/pages/money/pay?type=1&ordid=' + e.order_id + '&money=' + e.pay_price + '&is_zero=' + e.is_zero
 			});
 		},
 		//获取订单列表

pages/product/product.vue

@@ -37,7 +37,7 @@
 				<text class="price-tip">¥</text>
 				<text class="price">{{ goodsObjact.price}}</text>
 				<!-- <text class="m-price" v-if="goodsObjact.ot_price > goodsObjact.price">¥{{ goodsObjact.ot_price }}</text> -->
-				<text class="m-price" v-if="goodsObjact && goodsObjact.is_pack != 1 &&  pUser && pUser.recharge_resumption">赠送：{{(goodsObjact.price*1*pUser.recharge_resumption*0.01).toFixed(0)}}复投积分</text>
+				<text class="m-price" v-if="goodsObjact && goodsObjact.is_pack != 1 &&  pUser && pUser.recharge_resumption">赠送：{{ goodsObjact.is_zero==1?goodsObjact.give_pass:(goodsObjact.price*1*pUser.recharge_resumption*0.01).toFixed(0)}}{{goodsObjact.is_zero==1?'通证积分':"复投积分"}}</text>
 			</view>
 			<text class="title" v-if="goodsType == 0">{{ goodsObjact.store_name }}</text>
 		</view>
@@ -90,7 +90,7 @@
 						<view class="good-name clamp">{{ goodsObjact.store_name }}</view>
 						<text class="price">¥{{ actionPrice * goodsNumber }}</text>
 						<!-- <text class="price jf">{{ goodIntegral }}</text> -->
-						<!-- <text class="stock">库存：{{ goodsObjact.stock }}件</text> -->
+						<text class="stock">库存：{{ goodsObjact.stock }}</text>
 						<!-- <view class="selected" v-if="goodsType == 0">
 							已选：
 							<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem }}</text>

pages/zero/award.vue

@@ -23,8 +23,7 @@
 						<view class="info-num" v-else>0</view>
 					</template>
 					<template v-if="type == 10">
-						<view class="info-num" v-if="pUser && pUser.pass_integral">{{pUser.pass_integral.progress || '0'}}</view>
-						<view class="info-num" v-else>0</view>
+						<view class="info-num" v-if="pUser">{{pUser.freeze_integral || '0'}}</view>
 					</template>
 				</view>
 				<view class="shu"></view>
@@ -35,8 +34,7 @@
 						<view class="info-num" v-else >{{pUser.recommend.use_recommend || '0'}}</view>
 					</template>
 					<template v-if="type == 10">
-						<view class="info-num" v-if="pUser && pUser.pass_integral">{{pUser.pass_integral.use_recommend || '0'}}</view>
-						<view class="info-num" v-else >{{pUser.pass_integral.use_recommend || '0'}}</view>
+						<view class="info-num" v-if="pUser">{{pUser.use_freeze_integral || '0'}}</view>
 					</template>
 				</view>
 			</view>