~

manifest.json

@@ -2,8 +2,8 @@
     "name" : "鹿马商家助手",
     "appid" : "__UNI__1EA80F1", //这个是 web 的
     "description" : "商家",
-    "versionName" : "1.188",
-    "versionCode" : 1188,
+    "versionName" : "1.192",
+    "versionCode" : 1192,
     "transformPx" : false,
     "compatible" : {
         "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
@@ -59,7 +59,7 @@
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+                    // "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
                     "<uses-permission android:name=\"android.permission.REORDER_TASKS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -70,7 +70,7 @@
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
                 "schemes" : "lumastoreapp",
                 "minSdkVersion" : 22,
-                "targetSdkVersion" : 29
+                "targetSdkVersion" : 28
             },
             /* ios打包配置 */
             "ios" : {

pages/order/shopOrder.vue

@@ -180,6 +180,16 @@
 			</view>
 		</uni-popup>
 		
+		
+		<!-- 拒绝退款弹窗填写拒绝原因 -->
+		<uni-popup :show="qztkpup" :mask-click="false" type="center">
+			<view class="setSelect">
+				<view class="titelsf">退款</view>
+				<view class="inputfboxs flex ali-c"><textarea class="textarea" value="" placeholder="请填写退款原因" selection-start="-1" @input="HandleReasonRefusaltwo" /></view>
+				<view class="setbtns" @tap="saveReasontwo">确定</view>
+			</view>
+		</uni-popup>
+		
 		<!-- 高级搜索弹窗 -->
 		<uni-popup :isnonehover="false"  type="top" :show="isshowsearch" @change="changepupse"  >
 			<view class="Advancedsearch">
@@ -211,7 +221,7 @@
 <script>
 // import { StoreorderStatus, orderGoodsList } from '@/utils/api/order.js';
 import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import { orderStatus, orderList, oneKeyCancel, consentRefund, refuseRefund, getRefundOrderList, setReceivingGoods, shopExamine } from '@/utils/api/api.js';
+import { applyRefund,orderStatus, orderList, oneKeyCancel, consentRefund, refuseRefund, getRefundOrderList, setReceivingGoods, shopExamine } from '@/utils/api/api.js';
 
 import pageScrollTo from '@/components/pageScrollTo/pageScrollTo.vue';
 export default {
@@ -237,6 +247,10 @@ export default {
 			ReasonRefusal: '', //拒绝退款原因
 			showReasonRefusal: false ,//拒绝退款弹窗
 			
+			tk_order_id:"",
+			qztkpup:false,
+			ReasonRefusaltwo:"",//商家主动退款原因
+			
 			isshowsearch:false,//是否显示搜索
 			username:"",
 			tel:"",
@@ -452,10 +466,30 @@ export default {
 			});
 			this.showReasonRefusal = false; //关闭弹窗
 		},
-		// 获取拒绝退款原因
+		// 商家填写退款原因 
 		HandleReasonRefusal(e) {
 			this.ReasonRefusal = e.detail.value;
 		},
+		// 商家填写退款原因 
+		saveReasontwo(){
+			this.qztkpup = false;
+			
+			console.info("点击确定",this.ReasonRefusaltwo,this.tk_order_id);
+			
+			applyRefund({
+				order_id:this.tk_order_id,
+				refund_details:this.ReasonRefusaltwo,
+			}).then((res)=>{
+				this.$api.msg(res.msg);
+				
+				this.tk_order_id = "";
+				this.ReasonRefusaltwo = "";
+			})
+			
+		},
+		HandleReasonRefusaltwo(e){
+			this.ReasonRefusaltwo = e.detail.value;
+		},
 		/**
 		 * 初始化数据
 		 */
@@ -549,6 +583,12 @@ export default {
 				case 'refuseRefund': //拒绝退款
 					this.clrefund(2, order_id, index);
 					break;
+				case 'applyRefund'://商家主动退款订单
+					console.info("商家主动退款订单");
+					this.qztkpup = true;
+					this.tk_order_id = order_id;
+					// this.applyRefund(3,order_id,index);
+					break;
 				// 售后/退款新接口
 				case 'getRefundDetail': //订单详情
 					that.getRefundDetail(refund_id);

utils/api/api.js

@@ -374,6 +374,13 @@ export function refuseRefund(data)
 }
 
 
+//商家主动退款订单
+export function applyRefund(data)
+{
+  return request.post("order/applyRefund",data,{ noAuth : true});
+}
+
+
 
 //商城分类 用于添加产品的时候 选择分类
 export function getGoodsCate(data)

utils/config.js

@@ -5,8 +5,8 @@ module.exports = {
   //SiteBaseUrl:"https://zxluma.jxdsy.cn/api/",//测试
   // SiteBaseUrl:'https://kazuma.jxdsy.cn/api/',//正式
   
-  SiteBaseUrl:debug.isdebug?"https://zxluma.jxdsy.cn/merchant.php/":"https://kazuma.jxdsy.cn/merchant.php/",
-   SiteBaseUrltwo:debug.isdebug?"https://zxluma.jxdsy.cn/api.php/":"https://kazuma.jxdsy.cn/api.php/",
+  SiteBaseUrl:debug.isdebug?"http://zxluma.jxdsy.cn/merchant.php/":"https://kazuma.jxdsy.cn/merchant.php/",
+   SiteBaseUrltwo:debug.isdebug?"http://zxluma.jxdsy.cn/api.php/":"https://kazuma.jxdsy.cn/api.php/",
   
   //SiteBaseUrl:"https://zxluma.jxdsy.cn/merchant.php/",
   // SiteBaseUrl:"https://kazuma.jxdsy.cn/merchant.php/",

utils/request.js

@@ -108,6 +108,8 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
 	// data.token = store.state.token;//有token 需要把token 带上
   }
   
+  console.info("Url  + api",Url  + api);
+  console.info("data",data);
   return new Promise((reslove, reject) => {
     uni.request({
       url: Url  + api,
@@ -115,6 +117,7 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
       header: header,
       data: data || {},
       success: (res) => {
+		  console.info(res,"res");
 		  // uni.hideLoading();
         if (noVerify)
           reslove(res.data, res);
@@ -160,6 +163,7 @@ export default function request(api, method, data, {noAuth = false, noVerify = f
           //reject(res.data.msg || '系统错误');
       },
       fail: (msg) => {
+		  console.info(msg,"msg",Url  + api)
         reject('请求失败');
 		// uni.hideLoading();
       }