修改

app.js

@@ -16,15 +16,19 @@ App({
 	initSocket() {
 		let that = this;
 		this.globalData.SocketTask = wx.connectSocket({
-			url: (this.globalData.http.baseUrl + '/yos/webSocket/').replace("https", "wss").replace("http", "ws") + wx.getStorageSync('userMsg').token,
+			url: this.globalData.http.baseUrl.replace("https", "wss").replace("http", "ws") + '/yos/webSocket/' + wx.getStorageSync('userMsg').token,
 			complete: (res) => {
 				console.log(res)
 			}
 		})
+		
+		console.log(this.globalData.http.baseUrl.replace("https", "wss").replace("http", "ws") + '/yos/webSocket/' + wx.getStorageSync('userMsg').token)
+
 		this.globalData.SocketTask.onOpen(function (res) {
 			that.globalData.socketEstablish = true;
 		})
 		this.globalData.SocketTask.onMessage(function (res) {
+			console.log("消息", res)
 			that.globalData.socketCallback(res)
 		})
 		this.globalData.SocketTask.onError(function (res) {

packageA/activity/detail.js

@@ -171,7 +171,6 @@ Page({
 	creadedOrderForm({
 		list
 	}) {
-		console.log(list)
 		let that = this;
 		wx.showModal({
 			title: '提示',
@@ -189,8 +188,7 @@ Page({
 						sa_promotionid: that.data.detail.sa_promotionid,
 						"sa_brandid": that.data.detail.sa_brandid, //品牌ID
 						"type": "促销订单", //订单类型
-						"tradefield": that.data.detail.tradefield, //必选
-
+						"tradefield": that.data.detail.tradefield.join(','), //必选
 					}
 				}).then(res => {
 					console.log("创建促销订单", res);

packageA/market/detail.json

@@ -1,4 +1,5 @@
 {
   "usingComponents": {
+    "van-tag": "@vant/weapp/tag/index"
   }
 }

packageA/market/detail.wxml

@@ -13,7 +13,7 @@
 <!-- 产品介绍 -->
 <view class="intr">
 	<view class="title">
-		{{detail.itemname}}
+		{{detail.itemname}} <van-tag type="warning">{{detail.delistingstatus}}</van-tag>
 	</view>
 	<view class="tags">
 		<text wx:for="{{detail.brand}}" wx:key="sa_brandid">{{item.brandname}}</text>

pages/index/collect/index.scss

@@ -7,12 +7,12 @@ page {
 	width: 100vw;
 	background-color: #fff;
 	margin-bottom: 20rpx;
-	padding-bottom: 20rpx;
+	padding-bottom: 16rpx;
 	box-sizing: border-box;
 
 	.top {
 		display: flex;
-		padding: 20rpx 30rpx 10rpx;
+		padding: 20rpx 30rpx 0rpx;
 		box-sizing: border-box;
 
 

pages/index/collect/index.wxml

@@ -15,7 +15,7 @@
 						<van-checkbox shape='square' disabled="{{sa_brandid && sa_brandid!=item.sa_brandid}}" icon-size='24rpx' value="{{ decide.checked(item.sa_shoppingcartid,results) }}" />
 					</view>
 					<view class="exp">编号：{{item.itemno}}</view>
-					<view class="exp">规格：{{item.spec ||" --"}}</view>
+					<!-- <view class="exp">规格：{{item.spec ||" --"}}</view> -->
 					<view class="exp">型号：{{item.model ||" --"}}</view>
 					<view class="exp">品牌：{{item.brandname ||" --"}}</view>
 					<view class="exp">领域：{{item.tradefield_shoppingcart ||" --"}}</view>