liujiaxin 1 miesiąc temu
rodzic
commit
fbb84a11c1

+ 1 - 1
api/storeAfterSales.js

@@ -9,7 +9,7 @@ let request = new Request().http
  }
  
  export function getAfterSalesList(data) {
- 	 return request('/app/storeAfterSales/getAfterSalesList',data,'GET');
+ 	 return request('/app/storeAfterSales/getStoreAfterSalesList',data,'GET');
  } 
  
  export function getAfterSalesDetails(data) {

+ 3 - 3
pages/home/index.vue

@@ -1190,7 +1190,7 @@
 		.online-inquiry {
 			box-sizing: border-box;
 			width: 100%;
-			height: 170upx;
+			height: 300upx;
 			padding: 20upx;
 			background: linear-gradient(180deg, rgba(255, 255, 255, 0.38) 62%, rgba(255, 255, 255, 0) 100%);
 			display: flex;
@@ -1198,8 +1198,8 @@
 
 			.item {
 				// width: 46.13%;
-				width: 346upx;
-				height: 150upx;
+				width: 100%;
+				height: 100%;
 				position: relative;
 
 				.bg-img,

+ 5 - 5
pages/shopping/paymentOrder.vue

@@ -9,7 +9,7 @@
 					<text class="num" >{{payMoney.toFixed(2)}}</text>
 				</view>
 				<text class="desc" v-if="payType==2">代收金额{{payDelivery.toFixed(2)}},请您在收到快递后支付尾款给快递人员。</text>
-				<text class="desc" v-if="payType==3">货到付款金额{{payDelivery.toFixed(2)}},请您在收到快递后支付给快递人员。</text>
+				<!-- <text class="desc" v-if="payType==3">货到付款金额{{payDelivery.toFixed(2)}},请您在收到快递后支付给快递人员。</text> -->
 			</view>
 			<!-- 支付方式 -->
 			<view class="pay-type">
@@ -56,7 +56,7 @@
 						</label>
 					</view>
 					<!-- <view class="item" v-if="user!=null&&user.level==1 "> -->
-					<view class="item" >
+					<!-- <view class="item" >
 						<view class="left">
 							<image src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/pay_1.png" mode=""></image>
 							<text class="text">货到付款</text>
@@ -64,7 +64,7 @@
 						<label>
 							<radio  :value="3" :checked="order.payType=='3'" />
 						</label>
-					</view>
+					</view> -->
 				</radio-group>
 				<radio-group @change="payTypeChange" v-else-if="order.orderCreateType!=null&& order.orderCreateType==2">
 					<view class="item" v-if="payType==1||payType==4" >
@@ -86,7 +86,7 @@
 						</label>
 					</view>
 					<!-- <view class="item" v-if="user!=null&&user.level==1 "> -->
-					<view class="item" v-if="payType==1||payType==4" >
+					<!-- <view class="item" v-if="payType==1||payType==4" >
 						<view class="left">
 							<image src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/pay_1.png" mode=""></image>
 							<text class="text">货到付款</text>
@@ -94,7 +94,7 @@
 						<label>
 							<radio  :value="3" :checked="order.payType=='3'" />
 						</label>
-					</view>
+					</view> -->
 				</radio-group>
 				<radio-group @change="payTypeChange" v-else-if="order.orderCreateType!=null&&(order.orderCreateType==1)">
 					<view class="item"  >

+ 6 - 6
pages/user/index.vue

@@ -166,13 +166,13 @@
 								<text class="text">销售管理</text>
 							</view> -->
 
-							<!-- <view v-if="user.bindCompanyUserId" class="item no-marin-bottom" @click="openH5('/h5/userAgreement')">
+						<!-- 	<view v-if="user.bindCompanyUserId" class="item no-marin-bottom" @click="openH5('/store/h5/userAgreement')">
 								<image
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/service_file.png"
 									mode=""></image>
 								<text class="text">用户协议</text>
-							</view> -->
-							<!-- <view v-if="user.bindCompanyUserId" class="item no-marin-bottom align-top" @click="openH5('/h5/privacyPolicy')">
+							</view> 
+							<view v-if="user.bindCompanyUserId" class="item no-marin-bottom align-top" @click="openH5('/store/h5/privacyPolicy')">
 								<image
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/advice.png"
 									mode=""></image>
@@ -180,13 +180,13 @@
 							</view> -->
 
 
-							<!-- 测试用下面的 -->
-							<view class="item no-marin-bottom align-top" @click="navgetTo('/pages_course/livingList')">
+							<!-- 测试用下面的
+							<! <view class="item no-marin-bottom align-top" @click="navgetTo('/pages_course/livingList')">
 								<image
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/integral.png"
 									mode=""></image>
 								<text class="text">直播</text>
-							</view>
+							</view> -->
 
 							<view class="item no-marin-bottom" @click="toManager()">
 								<image

+ 1 - 1
pages_company/order/confirmCompanyOrder.vue

@@ -56,7 +56,7 @@
 		</view>
 		<modal v-if="inputShow" title="实收金额" confirm-text="保存" cancel-text="取消" @cancel="cancelUpdateMoney" @confirm="confirmUpdateMoney">
 			<input type="text" v-model="inputTxt" placeholder="请输入实收金额" class="intxt" maxlength="8" />
-			<input type="text" v-model="payAmount" placeholder="请输入货到付款金额" class="intxt pay_type" maxlength="8" />
+			<!-- <input type="text" v-model="payAmount" placeholder="请输入货到付款金额" class="intxt pay_type" maxlength="8" /> -->
 		</modal>
 	</view>
 </template>

+ 3 - 1
pages_course/living.vue

@@ -762,7 +762,8 @@
 				networkType: 'unknown', // 当前网络类型
 				isNetworkAvailable: true, // 网络是否可用
 
-				templateId: 'IKffTm6HnbLS91hDCUnKSQpC2r4EABo3fOtThnK1dI8',
+				templateId: 'IKffTm6HnbLS91hDCUnKSQpC2r4EABo3fOtThnK1dI8',//百域承品
+				
 				isAgreement: false,
 
 				wsNewUrl: 'wss://api.fhhx.runtzh.com/ws/app/webSocket',
@@ -2198,6 +2199,7 @@
 					userId: this.userInfo.userId,
 					templateId: this.templateId, // 模板ID
 					maOpenId:this.userInfo.maOpenId,
+					appid:this.appid,
 					data: {
 						thing6: this.liveItem.liveName,
 						date7: this.liveItem.startTime