Merge branch 'dev' into 'feature_recommend_q'

Dev

See merge request !5

App.vue

@@ -122,7 +122,8 @@
 					console.log('这里')
 					let res = await newsRemind({
 						uid:this.$store.state.userInfo.user_id,
-						cid:cid
+						cid:cid,
+						
 					});
 					
 					if(res.code==0){

components/bory-dateTimePicker/uitls/util.js

+/**
+ * 获取某年某月有多少天
+ */
+export const getOneMonthDays = (year,month)=>{
+	month = Number(month);
+	const baseMonthsDays = [31,28,31,30,31,30,31,31,30,31,30,31];
+	if(year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)){
+		if(month === 1){
+			baseMonthsDays[month] = 29;
+		}
+	}
+	return baseMonthsDays[month];
+}
+
+/**
+ * 获取日期的年月日时分秒
+ */
+export const getTimeArray = (date)=>{
+	const year = date.getFullYear();
+	const month = date.getMonth()+1;
+	const day = date.getDate();
+	const hour = date.getHours();
+	const minute = date.getMinutes();
+	const second = date.getSeconds();
+	return [year,month,day,hour,minute,second];
+}
+/**
+ * 小于10的数字前面补0
+ */
+export const addZero = (num)=>{
+	return num < 10 ? '0' + num : num;
+}
+
+/**
+ * 获取当前值在数组中的索引
+ */
+export const getIndexOfArray = (value,array)=>{
+	let index = array.findIndex(item => item == value);
+	return index > -1 ? index : 0;
+}
\ No newline at end of file

manifest.json

@@ -3,12 +3,12 @@
     //"appid" : "__UNI__FC9419E",
     "appid" : "__UNI__1EA80F1", //这个是 web 的
     "description" : "商家",
-    "versionName" : "1.0.96",
-    "versionCode" : 196,
+    "versionName" : "1.0.99",
+    "versionCode" : 199,
     "transformPx" : false,
     "compatible" : {
         "ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
-        "runtimeVersion" : "2.9.7,2.9.8", //兼容的uni-app运行环境版本号，多个版本使用,分割
+        "runtimeVersion" : "2.9.3,2.9.7,2.9.8", //兼容的uni-app运行环境版本号，多个版本使用,分割
         "compilerVersion" : "2.9.8" //兼容的编译器版本号
     },
     /* 5+App特有相关weex */

pages.json

@@ -395,6 +395,57 @@
 				"navigationBarTitleText": "物流发货",
 				"navigationBarBackgroundColor":"#FFFFFF"
 			}
+		},{
+			"path":"pages/publishActivities/activityList/activityList",
+			"style" : {
+				//机型列表
+				"navigationBarTitleText": "活动列表",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"enablePullDownRefresh":true
+			}
+		},{
+			"path":"pages/publishActivities/publishActivity/publishActivity",
+			"style" : {
+				//机型列表 activityDetail
+				"navigationBarTitleText": "发布免费活动",
+				"navigationBarBackgroundColor":"#FFFFFF"
+			}
+		},{
+			"path":"pages/publishActivities/activityDetail/activityDetail",
+			"style" : {
+				//机型列表 activityDetail
+				"navigationBarTitleText": "活动详情",
+				"navigationBarBackgroundColor":"#FFFFFF",
+				"enablePullDownRefresh":true
+			}
+		
+		},{
+            "path" : "pages/order/shoprefundorderdetail/shoprefundorderdetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "商城售后订单详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        
+        ,{
+            "path" : "pages/order/shopExamine/shopExamine",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "订单退款",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/order/ExamineDelivery/ExamineDelivery",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "立即发货",
+                "enablePullDownRefresh": false
+            }
+            
         }
     ],
 	"globalStyle": {

pages/ViewLogistics/ViewLogistics.vue

 <template>
 	<!-- yocode 物流信息 -->
 	<view class="content ViewLogistics yocode">
-		
 		<!-- 地图呀 -->
 		<!-- <view class="page-body">
 			<view class="page-section page-section-gap">
@@ -11,64 +10,64 @@
 		</view> -->
 
 		<view class="wuliuboxss flex ali-c">
-			<image class="imgs" :src="statictowUrl+'/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>
-				<view class="wuliutel">官方电话: {{phone}}</view>
+				<view class="wuliutype">{{ shipperName }}</view>
+				<view class="wuliucode">运单号: {{ logisticCode }}</view>
+				<view class="wuliutel">官方电话: {{ phone }}</view>
 			</view>
 		</view>
 
 		<!-- 查看物流的组件 alidata2.state -->
 		<ali :state="3" :datas="list" :ways="information"></ali>
-		
 	</view>
 </template>
 
 <script>
 import ali from '@/components/WuLiu-step/WuLiu-step.vue';
-import {checkLogistics} from "@/utils/api/api.js";
+import { checkLogistics,viewLogistics} from '@/utils/api/api.js';
 export default {
 	components: {
 		ali
 	},
 	computed: {
-		staticUrl () {//静态资源地址
+		staticUrl() {
+			//静态资源地址
 			return this.$store.state.staticUrl;
 		},
-		staticUrl1(){
+		staticUrl1() {
 			return this.$store.state.staticUrl1;
 		},
-		statictowUrl(){
+		statictowUrl() {
 			return this.$store.state.statictowUrl;
 		},
-		uploadurl(){
+		uploadurl() {
 			return this.$store.state.uploadurl;
 		}
 	},
 	data() {
 		return {
-			
 			//地图的东西
 			title: 'map',
 			latitude: 39.909,
 			longitude: 116.39742,
-			covers: [{
+			covers: [
+				{
 					latitude: 39.909,
 					longitude: 116.39742,
 					iconPath: '/static/news/address.png'
-			}, {
-				latitude: 39.90,
+				},
+				{
+					latitude: 39.9,
 					longitude: 116.39,
 					iconPath: '/static/news/address.png'
-			}],
+				}
+			],
 
 			alidata: {
 				state: 2,
 				uptime: '2019-05-23 17:52:06',
-				data: [
-					
-				],
+				data: [],
 				information: {
 					no: '231880744913',
 					sName: 'SF',
@@ -81,9 +80,7 @@ export default {
 			alidata2: {
 				state: 3,
 				uptime: '2019-05-24 10:58:24',
-				data: [
-					
-				],
+				data: [],
 				information: {
 					no: '70939995911523',
 					sName: 'HTKY',
@@ -95,10 +92,10 @@ export default {
 			},
 
 			list: [],
-			logisticCode: "",
-			shipperName: "",
-			logisticLogo: "",
-			phone: "",
+			logisticCode: '',
+			shipperName: '',
+			logisticLogo: '',
+			phone: '',
 			information: {
 				no: '',
 				sName: '',
@@ -110,61 +107,79 @@ export default {
 		};
 	},
 	onLoad(options) {
+		// console.log(options)
 		this.init();
-		
 		var that = this;
-		console.log(options);
+		// 判断为正常订单
+		if (options.order_id) {
 			let params = {
 				order_id: options.order_id,
 				action: options.action,
-		  vendor_id:options.vendor,
+				vendor_id: options.vendor
 			};
 			checkLogistics(params).then(res => {
 				console.log(res);
 				if (res.code == 0) {
 					let data = res.data;
 					let list = this.checkArray(data.Traces) ? data.Traces : [];
-			let logistics_info = this.getLogisticsConfig(data.ShipperCode)
-			
-			this.list=list.reverse();
-			this.logisticCode=data.LogisticCode;
-			this.shipperName=logistics_info.name;
-			this.logisticLogo= logistics_info.img_url;
-			this.phone=logistics_info.phone;
+					let logistics_info = this.getLogisticsConfig(data.ShipperCode);
 
+					this.list = list.reverse();
+					this.logisticCode = data.LogisticCode;
+					this.shipperName = logistics_info.name;
+					this.logisticLogo = logistics_info.img_url;
+					this.phone = logistics_info.phone;
+				}
+			});
+			// 如果为售后订单
+		} else if (options.refund_id) {
+			let refundParams = {
+				refund_id: options.refund_id,
+				type: 2
+			};
+			viewLogistics(refundParams).then(res => {
+				console.log(res)
+				if (res.code == 0) {
+					this.list = res.data.list;
+					let logistics_info = this.getLogisticsConfig(res.data.shipperCode);
+					this.list.reverse();
+					this.logisticCode = res.data.logisticCode;
+					this.shipperName = logistics_info.name;
+					this.logisticLogo = logistics_info.img_url;
+					this.phone = logistics_info.phone;
+				}
+			});
 		}
-		})
 	},
 	methods: {
-		init() {
-		},
+		init() {},
 		/**
 		 * 获取快递公司信息
 		 */
 		getLogisticsConfig(shipperCode) {
 			let config = {
-		      'YTO': { 'name': '圆通速递', 'phone': '95554', 'img_url': '/images/delivery_icon/YTO.png' },
-		      'HTKY': { 'name': '百世快递', 'phone': '95320', 'img_url': '/images/delivery_icon/HTKY.png' },
-		      'ZTO': { 'name': '中通快递', 'phone': '95311', 'img_url': '/images/delivery_icon/ZTO.png' },
-		      'STO': { 'name': '申通快递', 'phone': '95543', 'img_url': '/images/delivery_icon/STO.png' },
-		      'SF': { 'name': '顺丰速运', 'phone': '95338', 'img_url': '/images/delivery_icon/SF.png' },
-		      'YD': { 'name': '韵达速递', 'phone': '95546', 'img_url': '/images/delivery_icon/YD.png' },
-		      'YZPY': { 'name': '邮政快递包裹', 'phone': '11185', 'img_url': '/images/delivery_icon/EMS.png' },
-		      'EMS': { 'name': 'EMS', 'phone': '11183', 'img_url': '/images/delivery_icon/EMS.png' },
-		      'HHTT': { 'name': '天天快递', 'phone': '400-188-8888', 'img_url': '/images/delivery_icon/HHTT.png' },
-		      'JD': { 'name': '京东快递', 'phone': '950616', 'img_url': '/images/delivery_icon/JD.png' },
-		      'UC': { 'name': '优速快递', 'phone': '95349', 'img_url': '/images/qishou@2x.png' },
-		      'DBL': { 'name': '德邦快递', 'phone': '95353', 'img_url': '/images/delivery_icon/DBL.png' },
-		      'ZJS': { 'name': '宅急送', 'phone': '400-678-9000', 'img_url': '/images/qishou@2x.png' },
-		      'TNT': { 'name': 'TNT快递', 'phone': '400-820-9868', 'img_url': '/images/qishou@2x.png' },
-		      'UPS': { 'name': 'UPS', 'phone': '400-820-8388', 'img_url': '/images/qishou@2x.png' },
-		      'DHL': { 'name': 'DHL', 'phone': '95380', 'img_url': '/images/qishou@2x.png' },      
-		      'FEDEX': { 'name': 'FEDEX联邦(国内件）', 'phone': '400-886-1888', 'img_url': '/images/qishou@2x.png' },
-		      'FEDEX_GJ': { 'name': 'FEDEX联邦(国际件）', 'phone': '400-886-1888', 'img_url': '/images/qishou@2x.png' },
-		    }
+				YTO: { name: '圆通速递', phone: '95554', img_url: '/images/delivery_icon/YTO.png' },
+				HTKY: { name: '百世快递', phone: '95320', img_url: '/images/delivery_icon/HTKY.png' },
+				ZTO: { name: '中通快递', phone: '95311', img_url: '/images/delivery_icon/ZTO.png' },
+				STO: { name: '申通快递', phone: '95543', img_url: '/images/delivery_icon/STO.png' },
+				SF: { name: '顺丰速运', phone: '95338', img_url: '/images/delivery_icon/SF.png' },
+				YD: { name: '韵达速递', phone: '95546', img_url: '/images/delivery_icon/YD.png' },
+				YZPY: { name: '邮政快递包裹', phone: '11185', img_url: '/images/delivery_icon/EMS.png' },
+				EMS: { name: 'EMS', phone: '11183', img_url: '/images/delivery_icon/EMS.png' },
+				HHTT: { name: '天天快递', phone: '400-188-8888', img_url: '/images/delivery_icon/HHTT.png' },
+				JD: { name: '京东快递', phone: '950616', img_url: '/images/delivery_icon/JD.png' },
+				UC: { name: '优速快递', phone: '95349', img_url: '/images/qishou@2x.png' },
+				DBL: { name: '德邦快递', phone: '95353', img_url: '/images/delivery_icon/DBL.png' },
+				ZJS: { name: '宅急送', phone: '400-678-9000', img_url: '/images/qishou@2x.png' },
+				TNT: { name: 'TNT快递', phone: '400-820-9868', img_url: '/images/qishou@2x.png' },
+				UPS: { name: 'UPS', phone: '400-820-8388', img_url: '/images/qishou@2x.png' },
+				DHL: { name: 'DHL', phone: '95380', img_url: '/images/qishou@2x.png' },
+				FEDEX: { name: 'FEDEX联邦(国内件）', phone: '400-886-1888', img_url: '/images/qishou@2x.png' },
+				FEDEX_GJ: { name: 'FEDEX联邦(国际件）', phone: '400-886-1888', img_url: '/images/qishou@2x.png' }
+			};
 			return config[shipperCode] || {};
 		},
-		checkArray (obj) {
+		checkArray(obj) {
 			if (obj != undefined && obj != null && obj[0] != undefined) {
 				return true;
 			} else {
@@ -176,5 +191,5 @@ export default {
 </script>
 
 <style lang="scss">
-	@import "./ViewLogistics.scss";
+@import './ViewLogistics.scss';
 </style>

pages/addEditEleProduct/addEditEleProduct.vue

@@ -158,7 +158,6 @@
 				<view class="inputbox flex">
 					<picker mode="date" fields="day" :value="form.manufacture_date"  @change="bindDateChange">
 						<input disabled="true" class="input flex1"  type="text" v-model="form.manufacture_date" value="" placeholder-class="plclass" placeholder="请填写生产日期"  />
-					    <!-- <view class="uni-input">{{date}}</view> -->
 					</picker>
 				</view>
 			</view>
@@ -391,44 +390,40 @@
 					checked:'2'
 				}],
 				ischeckedtime:[0],//默认选中，
-				myProps: {
-				      label: 'cate_name',
-				      value: 'cate_id',
-				},
 				name: 'product',
 				result:[],
 				form: {
-					// mandatory:'2',
-					//  linkage_id:'',
-					// //cost_price 成本价 stock 商品库存purchase 进货价钱code 条形编码commission 返佣比例original_name 原始商品名
-					// specifications:'',//商品规格
-					// stock:'', //商品库存
-					// cost_price:'', //进货价钱
-					// code:'' ,//条形编码
-					// commission:'', //返佣比例
-					// sell_type:0,// 售卖类型
-					// commodity_data:{}, //原始商品名
-					// quality_guarantee_period:0, //保质期（月）
-					// manufacture_date:'' ,    //生产日期
-					// manufacturer :'',    ///生产厂商
-					// brand  :'',     // 品牌 
-					// checkbox: [],//断选
-					// product_id:"",//修改的时候的产品id
-					// product_name:"",//产品名称
-					// desc:"",//产品描述
-					// cate_id:"",//产品分类id
-					// photo:"",//产品图片
-					// lunch_box_fee:'',//餐盒费
-					// is_new:"",//是否新产品
-					// is_hot:"",//是否热卖产品
-					// action:"add",//	方式（添加：add，修改:edit）
-					// price:"",//价格
-					// activity_price:"",//秒杀价
-					// store_count:""	,// 秒杀库存
-					// is_seckill:"0",//0 1 是否秒杀产品
-					// activity_id:'0',//秒杀activity_id
-					// activity_list:'',//秒杀列表
-					// limit_num:"0" //秒杀限购数量 0 不限制 
+					mandatory:'2',
+					 linkage_id:'',
+					//cost_price 成本价 stock 商品库存purchase 进货价钱code 条形编码commission 返佣比例original_name 原始商品名
+					specifications:'',//商品规格
+					stock:'', //商品库存
+					cost_price:'', //进货价钱
+					code:'' ,//条形编码
+					commission:'', //返佣比例
+					sell_type:0,// 售卖类型
+					commodity_data:{}, //原始商品名
+					quality_guarantee_period:0, //保质期（月）
+					manufacture_date:'' ,    //生产日期
+					manufacturer :'',    ///生产厂商
+					brand  :'',     // 品牌 
+					checkbox: [],//断选
+					product_id:"",//修改的时候的产品id
+					product_name:"",//产品名称
+					desc:"",//产品描述
+					cate_id:"",//产品分类id
+					photo:"",//产品图片
+					lunch_box_fee:'',//餐盒费
+					is_new:"",//是否新产品
+					is_hot:"",//是否热卖产品
+					action:"add",//	方式（添加：add，修改:edit）
+					price:"",//价格
+					activity_price:"",//秒杀价
+					store_count:""	,// 秒杀库存
+					is_seckill:"0",//0 1 是否秒杀产品
+					activity_id:'0',//秒杀activity_id
+					activity_list:'',//秒杀列表
+					limit_num:"0" //秒杀限购数量 0 不限制 
 				},
 				timeList:[
 					{}
@@ -453,13 +448,16 @@
 				activity_type:"",//判断是否可以秒杀
 				seckilltimelist:[],//秒杀时段列表
 				selchildList:[],
-				cate_name:"",
+				
 				index:0,
 				isScanCode:true,//是不是点击了扫码 
 				codeDisabled:false,//条形码是否能输入
 				update:true,
 				detail_photos:[],//详情图片
 				video_photos:[],//轮播图片
+				
+				cate_name:"", //分类名
+				
 			}
 		},
 		computed: {
@@ -766,8 +764,15 @@
 				let res = await eleProductInfo({
 					product_id:this.product_id,
 				});
-				 console.log(res,'法大师傅大师傅大师傅士大夫大师傅');
 				if(res.code==0){	
+					this.form.cate_id = res.data.cate_id;//分类id
+					for(var i = 0; i < this.chindformList.length; i++) {
+						 if(this.chindformList[i].cate_id==res.data.cate_id){
+						 	this.cate_name=this.chindformList[i].cate_name;
+							break;
+						 }
+					}
+					
 					this.linkage_product_id = res.data.linkage_product_id
 					this.bools = res.data.product_name;
 					this.defaultinfo = res.data;
@@ -778,7 +783,7 @@
 					this.form.photo = res.data.photo;//图片
 					this.form.activity_price = res.data.activity_price //秒杀价
 					this.form.store_count = res.data.store_count //秒杀库存
-					this.form.cate_id = res.data.cate_id;//分类id
+					
 					this.form.activity_id = res.data.activity_id//秒杀时段id
 					this.form.limit_num = res.data.limit_num
 					this.form.specifications = res.data.gram
@@ -838,7 +843,6 @@
 						this.classValue = '';
 					}
 					
-					
 					//属性选默认值
 					if(res.data.is_new==1){
 						this.selchildList.push("is_new");
@@ -876,16 +880,18 @@
 				}
 			},
 			getForm() {
-				if(this.isshowsetkilltime && (this.form.activity_price==""||this.form.store_count==""||this.form.limit_num=="") ){
-					this.$api.msg("请填写完整秒杀数据");
-					 return false;
-				}
-				if(!this.isInteger(this.form.limit_num) || !this.isInteger(this.form.store_count)){
-					this.$api.msg("秒杀库存或限购数量不能为小数");
-					return false;
-				}
-				
+				// if(this.isshowsetkilltime && (this.form.activity_price==""||this.form.store_count==""||this.form.limit_num=="") ){
+				// 	this.$api.msg("请填写完整秒杀数据");
+				// 	 return false;
+				// }
+				
+				// console.log(this.form.limit_num,this.form.store_count)
+				// if(!this.isInteger(this.form.limit_num) || !this.isInteger(this.form.store_count)){
+				// 	this.$api.msg("秒杀库存或限购数量不能为小数");
+				// 	return false;
+				// }
 				let can = {
+					action:this.product_id==''?'add':'edit',
 					linkage_id:this.linkage_id,
 					mandatory:this.form.mandatory,
 					gram:this.form.specifications, //商品规格
@@ -902,7 +908,6 @@
 					product_name:this.form.product_name,//产品名称
 					desc:this.form.desc,//产品描述
 					lunch_box_fee:this.form.lunch_box_fee,//餐盒费
-					action:this.form.action,//方式（添加：add，修改:edit）
 					price:this.form.price,//价格
 					photo: this.c_pics.length == 0?'': this.c_pics[0].data, //图片
 					activity_price:this.form.activity_price,//秒杀价
@@ -912,6 +917,7 @@
 					limit_num:this.form.limit_num ,//秒杀限购数量	
 					detail_photos:this.detail_photos,//详情图
 					video_photos:this.video_photos,//轮播图
+					cate_id:this.form.cate_id,
 					
 				};
 				
@@ -941,11 +947,11 @@
 					can.is_hot = 0;
 				}
 				if(this.product_id!="" && this.is_datashow !=false ){ 
-					can.action = "edit";
 					can.product_id = this.product_id;
 				}
 				//添加修改外卖产品
 				addEditEleProduct(can).then((res1)=>{
+					console.log(res1,'成功了');
 					if(res1.code==0){
 						this.$api.msg(res1.msg);
 						setTimeout(()=>{
@@ -954,6 +960,8 @@
 					}else{
 						this.$api.msg(res1.msg);
 					}
+				}).catch(err=>{
+					console.log(err,'失败了');
 				})
 			},
 			

pages/index/index.vue

@@ -97,7 +97,7 @@
 				<!-- <navigator url="/pages/edit/pro_manage/pro_manage"> -->
 				<view class="jiu_min">
 					<view>
-						<image class="img" src="/static/icon/20.png" mode=""></image>
+						<image class="img" src="/static/icon/spgl.png" mode=""></image>
 					</view>
 					<view>商品管理</view>
 				</view>
@@ -144,7 +144,7 @@
 				<navigator url="/pages/storeCategory/storeCategory?type=1">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/icon/6.png" mode=""></image>
+							<image class="img" src="/static/icon/eleclass.png" mode=""></image>
 						</view>
 						<view>商品分类</view>
 					</view>
@@ -191,7 +191,7 @@
 				<navigator url="/pages/order/shopOrder">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/icon/8.png" mode=""></image>
+							<image class="img" src="/static/icon/eleguanli.png" mode=""></image>
 						</view>
 						<view>订单管理</view>
 					</view>
@@ -204,7 +204,7 @@
 				<navigator url="/pages/hotelOrder/hotelOrder">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/icon/8.png" mode=""></image>
+							<image class="img" src="/static/icon/eleguanli.png" mode=""></image>
 						</view>
 						<view>订单管理</view>
 					</view>
@@ -227,7 +227,7 @@
 				<navigator url="/pages/LuckDraw/homenav/homenav">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/news/liwuiocn.png" mode=""></image>
+							<image class="img" src="/static/icon/liwuiocn.png" mode=""></image>
 						</view>
 						<view>抽奖活动</view>
 					</view>
@@ -245,7 +245,7 @@
 				</navigator>
 			</view>
 
-			<view class="jiu_max ">
+			<view class="jiu_max " v-if="shop_type == 'ele'">
 				<navigator url="/pages/Printer/AddPrinter">
 					<view class="jiu_min">
 						<view>
@@ -256,7 +256,7 @@
 				</navigator>
 			</view>
 
-			<view class="jiu_max " @tap="shops">
+			<view class="jiu_max " @tap="shops" v-if="shop_type == 'ele'">
 				<view class="jiu_min">
 					<view>
 						<image class="img" src="/static/news/turntable.png" mode=""></image>
@@ -265,7 +265,7 @@
 				</view>
 			</view>
 
-			<view class="jiu_max ">
+			<view class="jiu_max " v-if="shop_type == 'ele'">
 				<navigator url="/pages/deliveryCost/deliveryCost">
 					<view class="jiu_min">
 						<view>
@@ -277,7 +277,7 @@
 			</view>
 			<!-- hgService.showSafeSetting(); -->
 
-				<view class="jiu_max " v-if="is_bld">
+			<view class="jiu_max " v-if="shop_type == 'ele'&&is_bld">
 				<navigator url="/pages/eleProduct/eleProduct?edit=1">
 					<view class="jiu_min">
 						<view>
@@ -288,7 +288,7 @@
 				</navigator>
 			</view>
 
-				<view class="jiu_max "  v-if="is_bld">
+			<view class="jiu_max " v-if="shop_type == 'ele'&&is_bld">
 				<navigator url="/pages/eleProduct/eleProduct?edit=2">
 					<view class="jiu_min">
 						<view>
@@ -300,7 +300,7 @@
 			</view>
 
 
-				<view class="jiu_max " @click="download"  v-if="is_bld">
+			<view class="jiu_max " @click="download" v-if="shop_type == 'ele'&&is_bld">
 				<view>
 					<view class="jiu_min"> 
 						<view>
@@ -310,6 +310,19 @@
 					</view>
 				</view>
 			</view>
+
+
+			<!-- url="/pages/publishActivities/activityList/activityList" -->
+			<view class="jiu_max " v-if="shop_type == 'ele'">
+				<navigator url="/pages/publishActivities/activityList/activityList">
+					<view class="jiu_min">
+						<view>
+							<image class="img" src="/static/icon/0yuan.png" mode=""></image>
+						</view>
+						<view>0元领活动</view>
+					</view>
+				</navigator>
+			</view>
 		</view>
 
 		<view class="BH"></view>
@@ -320,7 +333,8 @@
 
 <script>
 	import {
-		getskipShop
+		getskipShop,
+		activity_nucleus
 	} from "@/utils/api/merchant.js";
 	import uniBadge from "@/components/uni/uni-badge/uni-badge.vue"
 	import uniIcon from "@/components/uni/uni-icon/uni-icon.vue"
@@ -419,6 +433,19 @@
 			saoma(e) {
 				uni.scanCode({
 					success: res => {
+						if (res.scanType == 'QR_CODE') {
+							let param = this.GetRequest(res.result);
+							param.shop_id = this.shop_id
+
+							activity_nucleus(param).then(res => {
+								if (res.code == 0) {
+									this.$api.msg(res.msg);
+								}else{
+									this.$api.msg(res.msg);
+								}
+							})
+							return;
+						} else if (res.scanType == 'EAN_13') {
 							uni.request({
 								url: 'https://www.mxnzp.com/api/barcode/goods/details', //仅为示例，并非真实接口地址。
 								data: {
@@ -429,7 +456,7 @@
 								},
 								method: 'GET',
 								success: (results) => {
-								console.log(results);
+									// console.log(results);
 									if (results.data.code == 0) {
 										// this.$api.msg(results.data.msg);
 										results.isScanCode = false;
@@ -443,12 +470,12 @@
 										uni.navigateTo({
 											url: '/pages/addEditEleProduct/addEditEleProduct?results=' + JSON.stringify(results)
 										})
-									console.log(results)
+										// console.log(results)
 									}
 
 								},
 								fail: (results) => {
-								console.log(results);
+									// console.log(results);
 									results.isScanCode = false;
 									results.code = res.result;
 									uni.navigateTo({
@@ -457,8 +484,34 @@
 								}
 							})
 						}
+
+					}
 				});
 			},
+
+			// 解析链接中的参数
+
+			/**
+			 * 解析url地址的参数
+			 * @param {string} urlStr 
+			 */
+			GetRequest: (urlStr) => {
+				if (typeof urlStr == "undefined") {
+					var url = decodeURI(location.search); //获取url中"?"符后的字符串
+				} else {
+					var url = "?" + urlStr.split("?")[1];
+				}
+				var theRequest = new Object();
+				if (url.indexOf("?") != -1) {
+					var str = url.substr(1);
+					var strs = str.split("&");
+					for (var i = 0; i < strs.length; i++) {
+						theRequest[strs[i].split("=")[0]] = decodeURI(strs[i].split("=")[1]);
+					}
+				}
+				return theRequest;
+			},
+
 			jump() {
 				uni.navigateTo({
 					url: '/pages/edit/pro_manage/pro_manage?money_type=' + this.money_type + '&' + 'activity_type=' + this.activity_type
@@ -474,12 +527,12 @@
 				let that = this
 				uni.showModal({
 					title: '复制链接在电脑端浏览器打开',
-					content:`${that.$store.state.uploadurl}api/index/excel?shop_id=${this.shop_id}`,
+					content: `${that.$store.state.uploadurl}api/index/excel?shop_id=${that.shop_id}`,
 					confirmText: '复制',
 					success: function(res) {
 						if (res.confirm) {
 							uni.setClipboardData({
-								data: `${that.$store.state.uploadurl}api/index/excel?shop_id=${this.shop_id}`,
+								data: `${that.$store.state.uploadurl}api/index/excel?shop_id=${that.shop_id}`,
 								success: () => { //复制成功的回调函数
 									uni.showToast({ //提示
 										title: '复制成功'
@@ -511,7 +564,7 @@
 					this.is_luck_draw = res.data.shop_info.is_luck_draw
 					this.money_type = res.data.shop_info.money_type
 					this.activity_type = res.data.shop_info.activity_type //判断是否有秒杀资格
-
+					console.log(this.shop_type,'aa')
 				} else {
 					this.$api.msg(res.msg);
 				}

pages/order/ExamineDelivery/ExamineDelivery.scss

+//快速发货
+
+.delivery{
+	min-height: 100vh;
+	background: #F2F3F3;
+	padding: 20upx 0;
+}
+
+.fahuobox{
+	margin: 0 24upx;
+	padding: 0 20upx;
+	padding-bottom: 60upx;
+	background: #FFFFFF;
+	.selectcell{
+		height: 107upx;
+		line-height: 107upx;
+		border-bottom: 1px solid #F4F4F4;
+		.names{
+			font-size:30upx;
+			color:rgba(0,0,0,1);
+		}
+		.icons1{
+			width:48upx;
+			height:38upx;
+			margin-right: 26upx;
+		}
+		.icons2{
+			width:10upx;
+			height:18upx;
+		}
+		.icons3{
+			width:39upx;
+			height:42upx;
+			margin-right: 26upx;
+		}
+		.tosaomaboxs{
+			width: 50px;
+			text-align: right;
+		}
+		.icons4{
+			width:25upx;
+			height:25upx;
+			
+		}
+	}
+}
+
+.btnsbox{
+	margin-top: 60upx;
+	.btns{
+		width:300upx;
+		height:90upx;
+		line-height: 90upx;
+		text-align: center;
+		border:1px solid rgba(160,160,160,1);
+		border-radius:6upx;
+		
+		font-size:32upx;
+		color:rgba(0,0,0,1);
+		
+	}
+	.btns1{
+		border:0;
+		background: #FF6600;
+		color:#FFFFFF;
+	}
+}
\ No newline at end of file

pages/order/ExamineDelivery/ExamineDelivery.vue

+<template>
+	<!-- 商家发货 -->
+	<view class="delivery fahuo yocode">
+		<view class="fahuobox">
+			<!-- <picker @change="bindPickerChange" :value="index" :range="logsitslist"> -->
+				<view class="selectcell flex ali-c jus-b" @tap='pickerone'>
+					<view class="flex ali-c">
+						<image class="icons1" src="/static/news/fahuo.png" mode=""></image>
+						<view class="names">{{chindtext==''?'选择快递公司':chindtext}}</view>
+					</view>
+					<image class="icons2" src="/static/news/xiala.png" mode=""></image>
+				</view>
+				<lb-picker ref="picker" :list="logsitslist" :value='chindtext' range-key="label" :props="myProps" @confirm='confirm'></lb-picker>
+			<!-- </picker> -->
+			
+			<view class="selectcell flex ali-c jus-b">
+				<view class="flex ali-c">					
+					<image class="icons3" src="/static/news/dindhao.png" mode=""></image>
+					<input  class="names" type="text" value="" v-model="logscode"  placeholder="输入快递单号" />
+				</view>
+				<view @tap="tosaoyisao"  class="tosaomaboxs">
+					<image class="icons4" src="/static/news/saoma.png" mode=""></image>
+				</view>
+			</view>
+			
+			<view class="btnsbox flex ali-c jus-a">
+				<view class="btns">取消</view>
+				<view class="btns btns1" @tap="oneKeyShipmentsfun">确定发货</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { logisticsList,setDeliverGoods  } from '@/utils/api/api.js';
+	export default{
+		data(){
+			return{
+				myProps: {
+				      label: 'value',
+				      value: 'cate_id',
+				},
+				logsitslist:[
+					"圆通速递",
+					"百世快递",
+					"中通快递",
+					"申通快递",
+					"顺丰速运",
+					"韵达速递",
+					"邮政快递包裹",
+					"EMS",
+					"天天快递",
+					"京东快递",
+					"优速快递",
+					"德邦快递",
+					"宅急送",
+					"TNT快递",
+					"UPS",
+					"DHL",
+					"FEDEX联邦(国内件）",
+					"FEDEX联邦(国际件）"
+				],
+				index:0,
+				chindtext:"",
+				logscode:"",
+				refund_id: '',//订单id
+			}
+		},
+		onLoad(options) {
+			this.refund_id = options.refund_id;
+			// console.log(this.refund_id)
+			this.logisticsListfun();
+		},
+		methods:{
+			confirm(e){
+				console.log(e)
+				this.chindtext=e.value;
+			},
+			pickerone(){
+				this.$refs.picker.show() // 显示
+			},
+			async logisticsListfun(){
+				let res = await logisticsList({
+					
+				});
+				
+				if(res.code==0){
+					this.logsitslist  =res.data;
+				}else{
+					this.$api.msg(res.msg);
+				}
+			},
+			//快速发货 确认发货
+			async oneKeyShipmentsfun(){
+				if(this.chindtext==""){
+					this.$api.msg("请选中快速公司");
+					return false;
+				}
+				if(this.logscode==""){
+					this.$api.msg("物流单号不能为空");
+					return false;
+				}
+				let res = await setDeliverGoods({
+					logisticCode:this.logscode,//物流号 快递单号 订单号
+					shipperCode:this.chindtext,//名称 快递公司编号 名称
+					refund_id:this.refund_id,//订单id 订单id
+					shop_id:'',
+				});
+				if(res.code==0){
+					uni.showModal({
+					  title: '提示',
+					  content: res.msg,
+					  showCancel: false,
+					  success(res) {
+						uni.$emit("isDelorder",{action: 'setDeliverGoods'});
+						uni.navigateBack({}); //返回上一页
+					  }
+					})
+				}else{
+					this.$api.msg(res.msg);
+				}
+			},
+			//请求end
+			bindPickerChange(e){
+				console.log(e.detail.value,'哈哈哈');
+				this.chindtext = this.logsitslist[e.detail.value];
+			},
+			//扫码方法
+			tosaoyisao(){
+				uni.scanCode({
+				    success:  (res)=> {
+				        console.log('条码类型：' + res.scanType);
+				        console.log('条码内容：' + res.result);
+						
+						// let qrcodecon = 
+						
+						this.logscode = res.result;
+				    }
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import  "ExamineDelivery.scss"
+</style>

pages/order/shopExamine/shopExamine.vue

+<template>
+	<!-- 添加收获地址 OK -->
+	<!-- 添加收货地址呀 -->
+	<view class="content addddd yicode">
+		<view class="row b-b">
+			<text class="tit">收货人</text>
+			<input class="input" type="text" v-model="name" placeholder="请填写收货人姓名" placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b">
+			<text class="tit">手机号码</text>
+			<input class="input" type="number" v-model="mobile" placeholder="请填写手机号码" placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b">
+			<text class="tit">收货地址</text>
+			<input class="input" type="text" v-model="address" placeholder="请填写详细地址" placeholder-class="placeholder s24" @input="doorplate" />
+		</view>
+		<view class="submitbtn active" @tap="refundExamine">确定</view>
+	</view>
+</template>
+
+<script>
+import { shopExamine } from '@/utils/api/api.js';
+	
+export default {
+	data() {
+		return {
+			name: '',
+			mobile: '',
+			address: '',
+			type: '',//退款退款 退款
+			refund_id: ''
+		}
+	},
+
+	onShow() {
+
+	},
+	onHide() {
+
+	},
+	onUnload(){
+
+	},
+	onLoad(option){
+		// console.log(option)
+		this.type = option.type;
+		this.refund_id = option.refund_id;
+		// console.log(this.refund_id,this.type)
+	},
+	methods: {
+		refundExamine(){//提交
+			
+			if(!this.name){
+				this.$api.msg('请填写收货人姓名');
+				return;
+			}
+			if(!/(^1[3|4|5|7|8|9][0-9]{9}$)/.test(this.mobile)){
+				this.$api.msg('请输入正确的手机号码');
+				return;
+			}
+			if(!this.address){
+				this.$api.msg('请输入详细收货地址');
+				return;
+			}
+
+			// 参数
+			let params = {
+				contacts: this.name,//收货联系人
+				contact_number	: this.mobile,//收货联系电话
+				addr: this.address,//收货地址
+				type: this.type,
+				refund_id: this.refund_id,
+			}
+			shopExamine(params).then(res=>{
+				// console.log(res)
+				if(res.code == 0){
+					uni.$emit('isDelorder', { action: 'shopExamine' });//监听操作成功后跳回上一页自动刷新列表
+					uni.showToast({
+						title: '退款审核成功',
+						duration: 2000,
+						icon: 'none'
+					});
+					uni.navigateBack({})
+				}else{
+					this.$api.msg(res.msg);
+				}
+			})
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+	padding-top: 16upx;
+	// margin-top: 20upx;
+}
+
+.row {
+	display: flex;
+	align-items: center;
+	position: relative;
+	padding: 0 30upx;
+	height: 88upx;
+	background: #fff;
+	.immgs {
+		width: 13upx;
+		height: 24upx;
+		opacity: 0.5;
+	}
+	.tit {
+		flex-shrink: 0;
+		//width: 120upx;
+		width: 200upx;
+		font-size: 30upx;
+		color: $font-color-dark;
+	}
+	.input {
+		flex: 1;
+		font-size: 30upx;
+		color: $font-color-dark;
+	}
+	.icon-shouhuodizhi {
+		font-size: 36upx;
+		color: $font-color-light;
+	}
+}
+.default-row {
+	margin-top: 16upx;
+	.tit {
+		flex: 1;
+	}
+	switch {
+		transform: translateX(16upx) scale(0.9);
+	}
+}
+.add-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 690upx;
+	height: 80upx;
+	margin: 60upx auto;
+	font-size: $font-lg;
+	color: #fff;
+	background-color: $base-color;
+	border-radius: 10upx;
+	box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+}
+.addddd{
+	// margin-top: 40upx;
+}
+</style>

pages/order/shopOrder.scss

@@ -164,3 +164,39 @@
 .mt-20{
 	margin-top: 20upx;
 }
+
+.setSelect{
+	width:601upx;
+	height:660upx;
+	background:rgba(255,255,255,1);
+	border-radius:10upx;
+	.titelsf{
+		height: 88upx;
+		line-height: 88upx;
+		text-align: center;
+		font-size:32upx;
+		font-family:PingFang SC;
+		font-weight:bold;
+		color:rgba(0,0,0,1);
+	}
+	.selectbottom{
+		background: #FFFFFF;
+		padding: 0 24upx;
+	}
+	.setbtns{
+		margin: 0 auto;
+		margin-top: 90upx;
+		width:501upx;
+		height:88upx;
+		line-height:88upx;
+		text-align: center;
+		background:rgba(255,105,0,1);
+		border-radius:10upx;
+		font-size:32upx;
+		color:rgba(255,255,255,1);
+	}
+}
+.textarea{
+	font-size: 34upx;
+	padding: 30upx;
+}
\ No newline at end of file

pages/publishActivities/activityDetail/activityDetail.vue

+<template>
+	<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;">{{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">
+			<view class="fx "  style="justify-content: space-between;background-color: #fff;    align-items: center;
+    height: 100%">
+				<view class="fx" style="width: 75%;align-items: center;" >
+					<view style="height: 120upx;width: 120upx;border-radius: 120upx;text-align: center;line-height: 80upx;overflow: hidden;">
+						<image :src="item.face" style="display: inline;"></image>
+
+					</view>
+					<view style="margin:0 0 0 10upx;width: 75%;padding: 20upx 10upx;">
+						<view style="font: 34upx 微软雅黑;padding-bottom:10upx ;" class="oneline">{{item.nickname}}</view>
+						<view style="font-size:20upx;color:rgb(116, 113, 113);padding-top: 10upx;">{{item.verification_time}}</view>
+					</view>
+
+				</view>
+
+				<view style="width: 15%;height: 104upx;">
+					<!-- <text style="color:#DC143C;padding: 0 12upx;border-radius: 10upx;font-size: 32upx;">
+						
+					</text> -->
+					<image src="/static/lingqu.png" mode="" style="width:100% ;height: 100%;display: inline;"></image>
+				</view>
+				<!-- 关注插槽 -->
+				<!-- <slot name="before"></slot> -->
+
+			</view>
+
+			<!-- <slot name="content"> </slot> -->
+		</view>
+		
+		
+		<view v-if="getDetail.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
+			还没有人领取~~
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		activity_user
+	} from '@/utils/api/merchant.js';
+	export default {
+		data(){
+			return {
+				shop_id:'',
+				activity_id:'',
+				getDetail:[],
+				page:1,
+				receivePeopleNumber:0,
+				unreceivePeopleNumber:0,
+			}
+		},
+		onReachBottom() {
+			activity_user({
+				shop_id:this.shop_id,
+				activity_id:this.activity_id,
+				nucleus:1,
+				page:this.page
+			}).then(res=>{
+				if(res.code==0&&res.data.list.length>0){
+					this.page++
+					this.getDetail = res.data.list;
+					this.receivePeopleNumber=res.data.receivePeopleNumber;
+					this.unreceivePeopleNumber=res.data.unreceivePeopleNumber;
+					uni.stopPullDownRefresh();
+				}else{
+					uni.$api.msg('没有更多数据了')
+				}
+			})
+		},
+		
+		onPullDownRefresh() {
+			this.page = 1
+			activity_user({
+				shop_id:this.shop_id,
+				activity_id:this.activity_id,
+				nucleus:1
+			}).then(res=>{
+				if(res.code==0){
+					this.getDetail = res.data.list
+					this.receivePeopleNumber=res.data.receivePeopleNumber;
+					this.unreceivePeopleNumber=res.data.unreceivePeopleNumber;
+					uni.stopPullDownRefresh();
+				}
+			})
+		},
+		
+		onLoad(options) {
+			let that = this
+			that.activity_id = options.activity_id
+			uni.getStorage({
+				key: 'userInfo',
+				success(res) {
+					that.shop_id = res.data.shop_id
+				}
+			})
+			
+			activity_user({
+				shop_id:that.shop_id,
+				activity_id:that.activity_id,
+				nucleus:1
+			}).then(res=>{
+				if(res.code==0){
+					this.getDetail = res.data.list;
+					this.receivePeopleNumber=res.data.receivePeopleNumber;
+					this.unreceivePeopleNumber=res.data.unreceivePeopleNumber;
+				}
+			})
+			
+		},
+		
+	}
+</script>
+
+<style>
+	page{
+		background-color: #EEEEEE;
+	}
+	.fx {
+		display: flex;
+	}
+
+	.guanzhu {
+		padding: 24upx;
+		border-top: 2upx solid #eee;
+		/* border-bottom: 1upx solid #eee; */
+	}
+
+	.pd24 {
+		padding: 24upx
+	}
+</style>

utils/api/api.js

@@ -300,12 +300,22 @@ export function orderList(data)
   return request.post("order/orderList",data,{ noAuth : true});
 }
 
+// 商城退款/售后列表(新接口)
+export function getRefundOrderList(data) {
+  return request.post("RefundOrder/getRefundOrderList",data, { noAuth: false });
+}
+
 //商城订单详情
 export function orderDetails(data)
 {
   return request.post("order/orderDetails",data,{ noAuth : true});
 }
 
+// 商城退款/售后订单详情页面(新接口)
+export function getRefundDetail(data) {
+  return request.post("RefundOrder/getRefundDetail",data, { noAuth: false });
+}
+
 //商城订单一键核销
 export function oneKeyCancel(data)
 {
@@ -331,6 +341,26 @@ export function checkLogistics(data)
   return request.post("order/checkLogistics",data,{ noAuth : true});
 }
 
+// 商城退款/售后 查看物流
+export function viewLogistics(data) {
+  return request.post("RefundOrder/viewLogistics",data, { noAuth: false });
+}
+
+// 商城退款/售后 确认收货
+export function setReceivingGoods(data) {
+  return request.post("RefundOrder/setReceivingGoods",data, { noAuth: false });
+}
+
+// 商城退款/售后 商家审核
+export function shopExamine(data) {
+  return request.post("RefundOrder/shopExamine",data, { noAuth: false });
+}
+
+// 商城退款/售后 立即发货
+export function setDeliverGoods(data) {
+  return request.post("RefundOrder/setDeliverGoods",data, { noAuth: false });
+}
+
 //商城订单同意退款
 export function consentRefund(data)
 {

utils/api/merchant.js

@@ -47,6 +47,60 @@ export function getshopclass(data){
 }
 
 
+/**
+ * @param {Object} data
+ */
+//获取分类 列表
+export function activity_nucleus(data){
+	return request.post("/ele/activity_nucleus", data, { noAuth: true});
+}
 
+/**
+ * 添加免费领东西活动
+ * @param {Object} data
+ */
+export function activity_add(data){
+	return request.post("/ele/activity_add", data, { noAuth: true});
+}
 
+/**
+ * 获取活动列表
+ * @param {Object} data
+ */
+export function activity_select(data){
+	return request.post("/ele/activity_select", data, { noAuth: true});
+}
 
+/**
+ * 关闭活动
+ * @param {Object} data
+ */
+export function activity_close(data){
+	return request.post("/ele/activity_close", data, { noAuth: true});
+}
+
+/**
+ * 活动详情
+ * @param {} data
+ */
+export function activity_find(data){
+	return request.post("/ele/activity_find", data, { noAuth: true});
+}
+
+
+/**
+ * 
+ * @param {} data
+ */
+export function activity_user(data){
+	return request.post("/ele/activity_user", data, { noAuth: true});
+}
+
+
+/**
+ * 修改活动
+ * @param {} data
+ */
+export function activity_update(data){
+	return request.post("/ele/activity_update", data, { noAuth: true});
+}
\ No newline at end of file

utils/debug.js

@@ -4,18 +4,12 @@ module.exports = {
 	//是否为开发调试环境 true为本地环境 false 为正式环境
 
 	
-
 	// isdebug:false,//正式
-
 	isdebug:true,//测试
 	
+	// xqdebug:false,//正式权限	
+	 xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
 	
-	 xqdebug:false,//正式权限
-	  // xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
-
-	// #ifdef APP-PLUS
-	// isdebug:false,//正式 APP里面绝对是正式
-	// #endif	
 	
 	/**
 	 * PS