Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/kotra/BrandEnterSetIn/components/companyInformation.vue

@@ -23,7 +23,7 @@
 				<view class="company-name">
 					企业名称：{{company.CompanyName}}
 				</view>
-				<div class="reject" v-if="company.CompanyStatus==2">
+				<div class="reject" v-if="company.CompanyStatus==2&&company.RejectRemark">
 					<view class="">驳回原因</view>
 					<view style="font-size: 24rpx;margin-top: 10rpx;">
 						{{company.RejectRemark}}
@@ -32,7 +32,7 @@
 				<view class="option-box" v-if="company.CompanyStatus>0">
 					<view class="item" @click="setEditorHandler">修改</view>
 					<view class="split"></view>
-					<view class="item" v-if="company.CompanyStatus==2" style="color: #F60;">删除</view>
+					<view class="item" v-if="company.CompanyStatus==2" style="color: #F60;" @click="seeDelHandler">删除</view>
 					<view class="item" @click="seeDetailsHandler" v-else :style="{color:mainColor}">详情</view>
 				</view>
 			</div>
@@ -72,7 +72,38 @@
 			},
 			seeDetailsHandler(){
 				uni.navigateTo({
-					url:this.links[this.company.FirstShopType-1]+this.model.ID
+					url:that.links[that.company.FirstShopType-1]+that.model.ID
+				})
+				
+			},
+			seeDelHandler() {
+				let that = this
+				uni.showModal({
+					content: `是否删除企业 "${that.company.CompanyName}" 相关信息？`,
+					confirmText: "确认",
+					cancelText: '取消',
+					success: (res) => {
+						if (res.confirm) {
+							let parms = {
+								url: "/api/AppletTrade/RemoveCompanyEnterprise",
+								data: {
+									CompanyId: that.model.CompanyId
+								}
+							};
+							that.request2(parms, (res) => {
+								if (res.resultCode == 1) {
+									wx.showToast({
+										icon: 'none',
+										title: "删除成功！",
+										duration: 1000,
+									});
+									uni.navigateBack({
+										delta: 1
+									});
+								}
+							})
+						}
+					}
 				})
 			}
 		}

pages/kotra/carrier/list.vue

@@ -21,17 +21,6 @@
             ></u-search>
         </view>
         <view v-else class="carrierSearch" style="padding: 5px 10px;margin-top: 6rpx;">
-            <!-- <view class="carrierSearch-left">
-              <uni-section title="" type="line">
-                <uni-data-select
-                  v-model="msg.IsChengDu"
-                  :localdata="ShopTypeList"
-                  :clear="false"
-                  @change="ResetQuery"
-                ></uni-data-select>
-              </uni-section>
-            </view>
-            <view class="carrierSearch-auto"></view> -->
             <template v-if="iscpswjselectall==1&&replace.state=='1'">
               <view class="carrierSearch-left">
                 <uni-section title="" type="line">