asdf

pages/CardSend/CardSend.scss

@@ -264,10 +264,11 @@
 			
 			.text{
 				font-size: 32upx;
-				
+				margin-top: 20upx;
 			}
 			.prcie{
-				font-size: 60upx;
+				font-size: 40upx;
+				margin-top: 10upx;
 			}
 		}
 		
@@ -346,4 +347,21 @@
 			bottom:-20px;
 		}
 	}
+}
+.xiayiye{
+	width: 100%;
+	text-align: center;
+}
+
+.mb-20{
+	margin-bottom: 15upx;
+}
+.sousuo{
+	flex: 1;
+	height:60upx;
+	background:rgba(179, 179, 179,0.6);
+	border-radius:30upx;
+	padding: 0 20upx;
+	box-sizing: border-box;
+	color: #3B4144;
 }
\ No newline at end of file

pages/CardSend/CardSend.vue

@@ -169,7 +169,7 @@
 					<view>
 						<text class="bj pr-10" @tap="detailsFun(item)">编辑</text>
 						<view class="text">优惠</view>
-						<view class="prcie">{{item.money}}元</view>
+						<view class="prcie mb-20">{{item.money}}元</view>
 						<text class="bj pr-10" @tap="deleteFun(item)">删除</text>
 					</view>
 				</view>
@@ -185,18 +185,20 @@
 		
 		<!-- 选择参与活动的商品的弹出 -->
 		<!-- 底部分享弹窗 -->
-		<uni-popup :show="showshare" :type="type" @change="change">
+		<uni-popup :show="showshare" style="z-index: 99;" :type="type" @change="change">
 			<view class="childboxmain">
-				<view class="titlebox flex ali-c jus-b">
-					<view class="title">选择参与优惠的商品</view>
-					<image class="imgs" @tap="showshare=false" src="/static/news/plicons.png" mode=""></image>
+				<view class="titlebox">
+					<view class="ali-c jus-b" style="margin-bottom: 20upx;">
+						<view class="title">选择参与优惠的商品</view>
+						<image class="imgs" @tap="showshare=false" src="/static/news/plicons.png" mode=""></image>
+					</view>
+					<input class="sousuo" @input="onKeyInput"  placeholder="请输入搜索内容" />
 				</view>
 				<!-- scroll  scroll-left="120" -->
 				
 				<!-- @scroll="" -->
 				<scroll-view class="scroll-view_H" style="height: 50vh;" scroll-y="true" >
 					<view class="chindlist ">
-						
 						<checkbox-group class="flex  ali-c   flex-wrap chilidlistbox" @change="radioChange2" v-model="parameter.goods_id">
 							<label class="flex ali-c jus-b itemlable" v-for="(item,index) in shoplist" :key="index">
 								<view class="itemname">{{item.product_name}}</view>
@@ -205,6 +207,8 @@
 								</view>
 							</label>
 						</checkbox-group>
+						<view class="xiayiye title" @tap="nextPage" v-if="xianshi" >下一页>>></view>
+						<view class="xiayiye title" @tap="nextPage" v-else >没有更多了~</view>
 					</view>
 				</scroll-view>
 				<view class="submitbtns active" @tap="showshare=false" >确定</view>
@@ -250,6 +254,8 @@
 		},
 		data() {
 			return {
+				keywords:'',
+				xianshi:true,
 				istruesub:true,
 				tabactive:1,
 				showshare: false,//弹窗
@@ -294,6 +300,7 @@
 				cardlist:[],//已发的卡券
 				isallshow:false,
 				page:0,
+				pages:0,
 			};
 		},
 		onLoad(){
@@ -305,14 +312,24 @@
 		//滚动到最底部
 		onReachBottom(){
 			console.log("11");
-			
+			this.shop_goodsFun();
 			if(!this.isallshow && this.tabactive==2){
 				this.shop_couponFun();
 			}
 			
 		},
 		methods:{
-			
+			// 搜索
+			onKeyInput: function(event) {
+			            this.keywords = event.target.value
+						this.pages = 0;
+						this.shoplist=[];
+						this.shop_goodsFun();
+			        },
+			nextPage:function(){
+				this.pages++;
+				this.shop_goodsFun();
+			},
 			//取消编辑
 			colesedit(){
 				this.parameter={
@@ -340,11 +357,14 @@
 			//接口start
 			
 			//获取商城商品
-			async shop_goodsFun(){
+			async shop_goodsFun(keywords){
+				
 				let res =  await couponGoods({
-					
+					page:this.pages,
+					keywords:this.keywords
 				});
-				if(res.code==0){
+				
+					
 					let list = res.data;
 					list.map((item,index)=>{
 						if(item.goods_id){
@@ -360,11 +380,22 @@
 						item.checked = false;
 						return item;
 					})
-					this.shoplist = list;
+					// this.shoplist = list;
+					if(res.code==0){
+						if( list.length!=0){
+							this.shoplist = [...this.shoplist,...list];
+							this.xianshi = true;
+						}else{
+							// this.$api.msg("没有更多了~");
+							this.isallshow = true;
+							this.xianshi = false;
+							
+						}
+					
 					
 				}else{
 					this.parameter.range_type=  1;
-					// this.$api.msg(res.msg);
+					this.$api.msg(res.msg);
 				}
 			},
 			//coupons 商户发放卡券 提交发放卡券的方法 submit

pages/ViewLogistics/ViewLogistics.vue

@@ -11,7 +11,7 @@
 		</view> -->
 		
 		<view class="wuliuboxss flex ali-c">
-			<image class="imgs" :src="uploadurl+'/static/applet5'+logisticLogo" mode=""></image>
+			<image class="imgs" :src="statictowUrl+'/static/applet5'+logisticLogo" mode=""></image>
 			<view class="rightinfos">
 				<view  class="wuliutype">{{shipperName}}</view>
 				<view class="wuliucode">运单号: {{logisticCode}}</view>
@@ -39,6 +39,9 @@ export default {
 		staticUrl1(){
 			return this.$store.state.staticUrl1;
 		},
+		statictowUrl(){
+			return this.$store.state.statictowUrl;
+		},
 		uploadurl(){
 			return this.$store.state.uploadurl;
 		}

pages/deliveryCost/deliveryCost.vue

@@ -26,7 +26,7 @@
 				</view>
 			</view>
 			<view class="mints">
-				*注：每公里增加用单位为 公里/元
+				*注：每公里增加费用单位为 公里/元
 			</view>
 			<view v-if="false">
 				<view class="cell_input jus-b ali-c">

pages/order/delivery/delivery.vue

@@ -111,13 +111,13 @@
 					  content: res.msg,
 					  showCancel: false,
 					  success(res) {
-						// uni.redirectTo({
-						//   url: '/pages/shopOrderDetails/shopOrderDetails?order_id='+this.order_id
-						// })
+						uni.redirectTo({
+						  url: '/pages/order/shopOrder'
+						})
 						
-						uni.navigateBack({
-						    //delta: 2
-						});
+						// uni.navigateBack({
+						//     //delta: 2
+						// });
 					  }
 					})
 				}else{

utils/debug.js

@@ -6,6 +6,7 @@ module.exports = {
 	 isdebug:true,//测试
 	//isdebug:false,//正式
 
+
 	
 	 //xqdebug:false,//正式权限
 	  xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios