fd

manifest.json

@@ -3,8 +3,8 @@
     //"appid" : "__UNI__FC9419E",
     "appid" : "__UNI__1EA80F1", //这个是 web 的
     "description" : "商家",
-    "versionName" : "1.0.96",
-    "versionCode" : 196,
+    "versionName" : "1.0.98",
+    "versionCode" : 198,
     "transformPx" : false,
     "compatible" : {
         "ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
@@ -126,9 +126,9 @@
             },
             "splashscreen" : {
                 "android" : {
-                    "hdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
-                    "xhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
-                    "xxhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png"
+                    "hdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
+                    "xhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
+                    "xxhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png"
                 },
                 "ios" : {
                     "iphone" : {

pages/index/index.vue

@@ -317,7 +317,7 @@
 				<navigator url="/pages/publishActivities/activityList/activityList">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/icon/download.png" mode=""></image>
+							<image class="img" src="https://luma.jxdsy.cn/static/applet5/images/download.png" mode=""></image>
 						</view>
 						<view>0元领活动</view>
 					</view>

pages/order/order.vue

@@ -333,6 +333,6 @@
 	}
 
 	.orderlist{
-		padding: 100upx 24upx 0 24upx;box-sizing: border-box;
+		padding: 40upx 24upx 0 24upx;box-sizing: border-box;
 	}
 </style>

pages/publishActivities/activityDetail/activityDetail.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="">
 			<view class="" style="text-align: center;height: 120upx;line-height: 120upx;font-weight: bold;font-size: 32upx;">
-				以有 <text style="color: #21B94C;font-size: 60upx;">150</text>人领取   还剩50人未领取
+				已有 <text style="color: #21B94C;font-size: 60upx;">{{receivePeopleNumber}}</text>人领取   还剩{{unreceivePeopleNumber}}份未领取
 			</view>
 		</view>
 		<view class="" style="height: 160upx;padding: 0 24upx;background-color: rgb(255, 255, 255);margin-bottom: 20upx;" v-if="getDetail.length > 0 " v-for="(item,index) in getDetail">
@@ -51,7 +51,9 @@
 				shop_id:'',
 				activity_id:'',
 				getDetail:[],
-				page:1
+				page:1,
+				receivePeopleNumber:0,
+				unreceivePeopleNumber:0
 			}
 		},
 		onReachBottom() {
@@ -103,6 +105,9 @@
 			}).then(res=>{
 				if(res.code==0){
 					this.getDetail = res.data.list
+					this.receivePeopleNumber = res.data.receivePeopleNumber
+					this.unreceivePeopleNumber = res.data.unreceivePeopleNumber
+					
 				}
 			})
 			

pages/publishActivities/activityList/activityList.vue

@@ -23,7 +23,7 @@
 						</label> -->
 						<image class="thumbnail" :src="staticUrl + item.picture" mode=""></image>
 						<view class="infobox" style="width: 70%;">
-							<view class="title oneline" style="height:40upx ;">{{item.goods_name}}</view>
+							<view class="title oneline" style="height:44upx ;">{{item.goods_name}}</view>
 							<!-- <view class="time">上架时间：{{item.create_time}}</view> -->
 							<view>
 								<view style="font-size:26rpx;font-weight:bold;">领取时间：</view>
@@ -49,7 +49,7 @@
 			</view>
 			
 			<view v-if="start_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
-				还没有人领取~~
+				快发布活动吧~~
 			</view>
 			
 		</view>
@@ -86,7 +86,7 @@
 				</checkbox-group>
 			</view>
 			<view v-if="end_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
-				还没有人领取~~
+				没有过期活动~~
 			</view>
 		</view>
 

utils/api/merchant.js

@@ -38,12 +38,12 @@ export function getActivityList(data){
 
 //判断商家类型  商品入库 
 export function getskipShop(data){
-	return request.post("/user/skipShop", data, { noAuth: true});
+	return request.post("user/skipShop", data, { noAuth: true});
 }
 
 //获取分类 列表
 export function getshopclass(data){
-	return request.post("/ele/weigh", data, { noAuth: true});
+	return request.post("ele/weigh", data, { noAuth: true});
 }
 
 
@@ -52,7 +52,7 @@ export function getshopclass(data){
  */
 //获取分类 列表
 export function activity_nucleus(data){
-	return request.post("/ele/activity_nucleus", data, { noAuth: true});
+	return request.post("ele/activity_nucleus", data, { noAuth: true});
 }
 
 /**
@@ -60,7 +60,7 @@ export function activity_nucleus(data){
  * @param {Object} data
  */
 export function activity_add(data){
-	return request.post("/ele/activity_add", data, { noAuth: true});
+	return request.post("ele/activity_add", data, { noAuth: true});
 }
 
 /**
@@ -68,7 +68,7 @@ export function activity_add(data){
  * @param {Object} data
  */
 export function activity_select(data){
-	return request.post("/ele/activity_select", data, { noAuth: true});
+	return request.post("ele/activity_select", data, { noAuth: true});
 }
 
 /**
@@ -76,7 +76,7 @@ export function activity_select(data){
  * @param {Object} data
  */
 export function activity_close(data){
-	return request.post("/ele/activity_close", data, { noAuth: true});
+	return request.post("ele/activity_close", data, { noAuth: true});
 }
 
 /**
@@ -84,7 +84,7 @@ export function activity_close(data){
  * @param {} data
  */
 export function activity_find(data){
-	return request.post("/ele/activity_find", data, { noAuth: true});
+	return request.post("ele/activity_find", data, { noAuth: true});
 }
 
 
@@ -93,7 +93,7 @@ export function activity_find(data){
  * @param {} data
  */
 export function activity_user(data){
-	return request.post("/ele/activity_user", data, { noAuth: true});
+	return request.post("ele/activity_user", data, { noAuth: true});
 }
 
 
@@ -102,5 +102,5 @@ export function activity_user(data){
  * @param {} data
  */
 export function activity_update(data){
-	return request.post("/ele/activity_update", data, { noAuth: true});
+	return request.post("ele/activity_update", data, { noAuth: true});
 }
\ No newline at end of file

utils/debug.js

@@ -5,9 +5,9 @@ module.exports = {
 
 	
 
-	 // isdebug:false,//正式
+	 isdebug:false,//正式
 
-	 isdebug:true,//测试
+	 // isdebug:true,//测试