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

components/guidecar/index.vue

@@ -146,8 +146,6 @@
 </template>
 
 <script>
-	
-	// import AddressParse from '../address/zh-address-parse.min.js'
 	import AddressParse from '../../pages/address/zh-address-parse.min.js'
 	export default{
 		props: {

pages/index/index.vue

@@ -386,6 +386,7 @@ export default {
   },
   onLoad(options) {
     let that = this;
+	// that.yj()
     // options = {user_id:125459,SmallShopId:0,EduSchoolId:79}
     uni.getSystemInfo({
       success(res) {
@@ -666,7 +667,7 @@ export default {
       : 0;
     return {
       title: title,
-      query: "user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up,
+      query: "user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up+ "&page_id=" + this.pageId,
       imageUrl: "",
     };
   },
@@ -707,7 +708,7 @@ export default {
         "&SmallShopId=" +
         SmallShopId +
         "&Up=" +
-        Up,
+        Up+ "&page_id=" + this.pageId,
       imageUrl: "",
     };
   },
@@ -1560,9 +1561,16 @@ export default {
       //   console.log("tag", "刷新");
     },
     yj() {
+      let data={
+      			Id : 5,
+      			ListType:5,
+      			template_message_list :  ["TRUazxijixEVRp4TBSEH9jJwhMC6PdWXrLL7zyizCVc"]
+      		}
       uni.navigateTo({
-        // url: '/pages/blindDate/persondetails?UserId=123978'
-        url: "/pages/kotra/signSuccse",
+        // url: "/pages/kotra/billboard/billboardList",
+        // url: "/pages/kotra/billboard/mybillbordList",
+      		url: "/pages/kotra/billboard/billboarddetails?Id=9&type=2",
+      		// url: "/pages/kotra/billboard/listsignUp?formData="+encodeURIComponent(JSON.stringify(data)),
       });
     },
   },

pages/kotra/activityList.vue

@@ -40,6 +40,19 @@
   font-size: 12px;
   width: 100%;
 }
+.seebtn {
+  width: 200rpx;
+  height: 60rpx;
+  background: #f70027;
+  border-radius: 20rpx;
+  font-size: 20rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #ffffff;
+  text-align: center;
+  line-height: 60rpx;
+  margin-top: 30rpx;
+}
 </style>
 <template>
   <view class="activityList" style="height: 100vh">
@@ -84,21 +97,12 @@
               <view>结束时间：{{ item.EndTimeStr }}</view>
             </view>
           </view>
-          <view>
-            <u-button
-              size="80"
-              :ripple="true"
-              shape="circle"
-              :custom-style="{
-                backgroundColor: mainColor ? mainColor : '#1F1F1F',
-                color: '#FFF',
-                fontSize: '28rpx',
-                marginTop: '10rpx',
-                width: '300rpx',
-                height: '88rpx',
-              }"
-              @click="goSignList(item)"
-              >查看报名信息</u-button
+          <view style="display: flex; justify-content: flex-end">
+            <view
+              class="seebtn"
+              :style="{ backgroundColor: mainColor ? mainColor : '#1F1F1F' }"
+              @click.stop="goSignList(item)"
+              >查看报名信息</view
             >
           </view>
         </view>

pages/kotra/billboard/components/ld-select.vue

@@ -108,9 +108,12 @@
 			if(this.multiple == true){
 				this.value = []
 			}
-			console.log(this.list,'list')
+			console.log(this.value,'value')
 		},
-		methods: {
+		methods: {
+			getmorendata(){
+				console.log('进来了')
+			},
 			get_value(val){ // 将数组值转换为以,隔开的字符串
 				if(val || val===0){
 					if(Array.isArray(val)){

pages/kotra/billboard/listsignUp.vue

@@ -137,12 +137,11 @@
 					this.addMsg.ObjectId = this.formData.ObjectId
 					this.ObjectName = this.formData.ObjectName
 					this.dataList = this.formData.Content
-					console.log(this.dataList)
-					this.dataList.forEach(x=>{
-						if(x.CompKey=="DorpDownList"){
-							x.CompData.OptionValue = x.CompData.OptionValue.split(',')
-						}
-					})
+					// this.dataList.forEach(x=>{ 
+					// 	if(x.CompKey=="DorpDownList"){
+					// 		x.CompData.OptionValue = x.CompData.OptionValue.split(',')
+					// 	}
+					// })
 					
 				}else{
 					this.addMsg.ListId = this.formData.Id;

pages/kotra/billboard/plugin/selectChoice.vue

@@ -7,7 +7,7 @@
 		                label-key="Name" value-key="Id"
 						:multiple="CompData.IsMultiple"
 		                placeholder="请选择"
-		                
+		                ref='ldselect'
 		                v-model="CompData.OptionValue"
 		                @change="selectChange"></ld-select>
 		<view class="single_Remark" v-if="CompData.Remark">{{CompData.Remark}}</view>
@@ -25,7 +25,15 @@
 			}
 		},
 		created() {
-			
+			console.log(this.CompData,'CompData')
+			if(this.CompData.OptionValue && this.CompData.OptionValue!=''){
+				
+				if (Object.keys(this.$refs).length > 0 && this.$refs.ldselect) {
+				  //判断
+				  console.log(this.$refs.ldselect,'ldselect')
+				  ; 
+				}
+			}
 		},
 		methods:{
 			selectChange(e){

pages/kotra/brand/detail.vue

@@ -38,7 +38,7 @@
                 margin-right: -40rpx;
                 position: absolute;
                 top: 0;
-                right: 30rpx;
+                right: 50rpx;
               "
               @click="follow"
             >

pages/kotra/carrier/detail.vue

@@ -330,6 +330,11 @@
                 v-if="detailData.AreaRequirement > 0"
                 >{{ detailData.AreaRequirement }}万㎡</text
               >
+              <text
+                style="color: #f30329; font-weight: bold"
+                v-if="detailData.AreaRequirement <= 0"
+                >/</text
+              >
             </view>
             <view style="flex: 1; font-size: 26rpx; color: #a4a4a4">
               <text style="width: 156rpx; text-align: right">经营面积：</text>
@@ -338,6 +343,11 @@
                 v-if="detailData.BuiltUpArea > 0"
                 >{{ detailData.BuiltUpArea }}万㎡</text
               >
+              <text
+                style="color: #f30329; font-weight: bold"
+                v-if="detailData.BuiltUpArea <= 0"
+                >/</text
+              >
             </view>
           </view>
           <view
@@ -468,6 +478,7 @@
                   line-height: 38rpx;
                   font-weight: 600;
                 "
+                v-if="detailData.Discount"
                 ><!--招引优惠-->{{ detailData.Discount }}</text
               >
             </view>
@@ -499,6 +510,7 @@
                   line-height: 38rpx;
                   font-weight: 600;
                 "
+                v-if="detailData.StartingInfo"
                 ><!--首发、首展、首秀政策-->{{ detailData.StartingInfo }}</text
               >
             </view>
@@ -726,7 +738,7 @@
             </view>
           </view>
           <view
-            style="margin-bottom: 83rpx; text-align: right; position: relative"
+            style="margin-bottom: 93rpx; text-align: right; position: relative"
           >
             <view style="text-align: left">
               <image

pages/kotra/signList.vue

@@ -163,7 +163,6 @@ export default {
           data: this.qmsg,
         },
         (res) => {
-          console.log(res);
           if (res.resultCode == 1) {
             this.dataList = res.data.CommerceConsultList;
           }
@@ -172,22 +171,27 @@ export default {
     },
     //删除用户
     deleteUser(item) {
-      var delMsg = {
+      let delMsg = {
         Id: item.Id,
       };
+      let that = this;
       uni.showModal({
         title: "提示",
         content: "确认删除？",
         success: function (res) {
           if (res.confirm) {
-            this.request2(
+            that.request2(
               {
                 url: "/api/AppletTrade/DeleteTrdceConsult",
                 data: delMsg,
               },
-              (res) => {
-                if (res.resultCode == 1) {
-                  this.getList();
+              (_res) => {
+                if (_res.resultCode == 1) {
+                  uni.showToast({
+                    title: "删除成功",
+                    duration: 2000,
+                  });
+                  that.getList();
                 }
               }
             );

pages/kotra/signListEdit.vue

 <style>
-page {
-  backgroundcolor: "#F6F6F6";
+.editpage {
+  height: 100vh;
+  background-color: #f6f6f6;
+  padding: 0rpx 35rpx 35rpx;
+  box-sizing: border-box;
 }
 .signedit {
   width: 680rpx;
+  height: 100%;
   background: #ffffff;
   border-radius: 30rpx;
   margin: 0 auto;
@@ -54,46 +58,48 @@ page {
 }
 </style>
 <template>
-  <view class="signedit" style="height: 100vh">
-    <view class="box">
-      <view class="name">姓名</view>
-      <input
-        type="text"
-        class="input"
-        v-model="msg.LinkMan"
-        placeholder="请输入姓名"
-      />
-    </view>
-    <view class="box">
-      <view class="name">公司职务</view>
-      <input
-        type="text"
-        class="input"
-        v-model="msg.Post"
-        placeholder="请输入公司职务"
-      />
-    </view>
-    <view class="box">
-      <view class="name">所属区域</view>
-      <input
-        type="text"
-        class="input"
-        v-model="msg.CountryInfo"
-        placeholder="请输入所属区域"
-      />
-    </view>
-    <view class="box">
-      <view class="name">联系电话</view>
-      <input
-        type="text"
-        class="input"
-        v-model="msg.LinkTel"
-        placeholder="请输入联系电话"
-      />
-    </view>
-    <view class="btnBox">
-      <view class="btn btn1" @click="submit">确认修改</view>
-      <view class="btn btn2" @click="quxiao">取消</view>
+  <view class="editpage">
+    <view class="signedit">
+      <view class="box">
+        <view class="name">姓名</view>
+        <input
+          type="text"
+          class="input"
+          v-model="msg.LinkMan"
+          placeholder="请输入姓名"
+        />
+      </view>
+      <view class="box">
+        <view class="name">公司职务</view>
+        <input
+          type="text"
+          class="input"
+          v-model="msg.Post"
+          placeholder="请输入公司职务"
+        />
+      </view>
+      <view class="box">
+        <view class="name">所属区域</view>
+        <input
+          type="text"
+          class="input"
+          v-model="msg.CountryInfo"
+          placeholder="请输入所属区域"
+        />
+      </view>
+      <view class="box">
+        <view class="name">联系电话</view>
+        <input
+          type="text"
+          class="input"
+          v-model="msg.LinkTel"
+          placeholder="请输入联系电话"
+        />
+      </view>
+      <view class="btnBox">
+        <view class="btn btn1" @click="submit">确认修改</view>
+        <view class="btn btn2" @click="quxiao">取消</view>
+      </view>
     </view>
   </view>
 </template>
@@ -144,25 +150,24 @@ export default {
         }
       );
     },
-    //删除用户
-    deleteUser(item) {
-      var delMsg = {
-        Id: item.Id,
-      };
-      this.request2(
-        {
-          url: "/api/AppletTrade/DeleteTrdceConsult",
-          data: delMsg,
-        },
-        (res) => {
-          if (res.resultCode == 1) {
-            this.getList();
-          }
-        }
-      );
-    },
     //修改用户信息
     submit() {
+      if (this.msg.LinkMan == "" || !this.msg.LinkMan) {
+        uni.showToast({
+          title: "请输入姓名",
+          duration: 2000,
+          icon: "error",
+        });
+        return;
+      }
+      if (this.msg.LinkTel == "" || !this.msg.LinkTel) {
+        uni.showToast({
+          title: "请输入联系电话",
+          duration: 2000,
+          icon: "error",
+        });
+        return;
+      }
       this.request2(
         {
           url: "/api/AppletTrade/SetTradeConsult",
@@ -178,9 +183,6 @@ export default {
             uni.navigateTo({
               url: "/pages/kotra/activityList",
             });
-            // uni.navigateBack({
-            //   delta: 1,
-            // });
           }
         }
       );