zhaoxiaohai преди 4 години
родител
ревизия
588df02038

+ 4 - 0
components/My_SearchInputBox/index.js

@@ -68,6 +68,10 @@ Component({
                 wx.navigateTo({
                     url: '/pages/teamManagement/change',
                 })
+            } else if(this.data.route == 'consociation'){
+                wx.navigateTo({
+                  url: '/pages/businessPartner/applyFor',
+                })
             }
         },
         /* 清空 */

+ 2 - 2
components/My_selectTime/index.js

@@ -7,12 +7,12 @@ Component({
         /* 最小时间 */
         minDate: {
             type: Number,
-            value: -284025600000, //1961.1.1
+            value: -2177481600000, //1901.1.1
         },
         /* 最大选择时间 */
         maxDate: {
             type: Number,
-            value: Date.parse(new Date()) //当前时间
+            value: Date.parse(new Date())-568080000000 //当前时间
         },
         /* 弹窗显示 */
         showSelectTime: {

+ 1 - 1
pages/announceDemand/index.wxml

@@ -2,7 +2,7 @@
     <view class="store_message">
         <My_GreyRectangleForm title="需求分类" required>
             <view style="width: 100%; height: 100%; z-index: 999; position: absolute;" bindtap="showPop"></view>
-            <van-field autosize model:value="{{ ftype }}" data-name="ftype" bind:focus='inputFocus' bindblur='inputBlur' error="{{errTips.ftype}}" input-class="input-class" placeholder="点击设置" border="{{ false }}" />
+            <van-field autosize model:value="{{ ftype }}" data-name="ftype" bind:focus='inputFocus' bindblur='inputBlur' error="{{errTips.ftype}}" input-class="input-class" placeholder="点击选择" border="{{ false }}" />
         </My_GreyRectangleForm>
         <My_GreyRectangleForm title="需求标题" required>
             <van-field autosize model:value="{{ ftitle }}" data-name="ftitle" bind:focus='inputFocus' bindblur='inputBlur' error="{{errTips.ftitle}}" input-class="input-class" placeholder="点击填写" border="{{ false }}" />

+ 40 - 3
pages/businessPartner/applyFor.js

@@ -1,4 +1,7 @@
-// pages/businessPartner/applyFor.js
+import {
+    ApiModel
+} from "../../utils/api";
+const _Http = new ApiModel;
 Page({
 
     /**
@@ -8,7 +11,8 @@ Page({
         showBtn: -1,//选中下标
         pattern: false,//显示方式选择
         dropDownList:false,//显示下拉菜单
-        methodsList:['上游','下游','双向合作']
+        methodsList:['上游','下游','双向合作'],
+        addvalue:""
     },
 
     /**
@@ -17,12 +21,45 @@ Page({
     onLoad: function (options) {
 
     },
+    onChange({detail}){
+        this.setData({
+            addvalue:detail
+        })
+    },
+    onClick(){
+        _Http.basic({
+            "accesstoken": wx.getStorageSync('userData').token,
+            "classname": "customer.tagents.tagents",
+            "method": "apply_cooperation",
+            "content": {
+                "tcooperationagentsid": "27303",
+                "ftype": "1"
+            }
+        }).then(res=>{
+            console.log(res)
+        })
+    },
 
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
     onReady: function () {
 
+    },
+    modeSelect(e){
+        const { index } = e.target.dataset;
+        const content=(this.data.methodsList[index]=='双向合作')?'是否确定***作为您的'+this.data.methodsList[index]+'伙伴':'是否确定***作为您的'+this.data.methodsList[index]+'合作伙伴';
+        wx.showModal({
+            title: '提示',
+            content: content,
+            success: function (res) {
+              if (res.confirm) {
+                console.log('确定')
+              } else {
+                console.log('取消')
+              }
+            }
+          })
     },
     /* 选择 */
     showBtnIndex(e) {
@@ -38,7 +75,7 @@ Page({
     /* 选择合作方式 */
     chooseCooperationMode(){
         this.setData({
-            dropDownList:true
+            dropDownList:!this.data.dropDownList
         })
     },
     hiddenDropDown(){

+ 2 - 1
pages/businessPartner/applyFor.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "My_DisplayBox": "/components/My_DisplayBox/index"
+    "My_DisplayBox": "/components/My_DisplayBox/index",
+    "van-search": "@vant/weapp/search/index"
   }
 }

+ 16 - 4
pages/businessPartner/applyFor.wxml

@@ -11,14 +11,26 @@
                 <van-button custom-class="custom-class-company-data" catchtap="ratify">同意</van-button>
             </view> 
             <view wx:else class="pattern">
-                <input type="text" bindfocus="chooseCooperationMode" bindblur="hiddenDropDown" style="width: 100%; height: 100%;position: absolute; opacity: 0;"/>
+                <input type="text" readonly="readonly" autocomplete="off" bindfocus="chooseCooperationMode" bindblur="hiddenDropDown" style="width: 100%; height: 100%;position: absolute; opacity: 0;"/>
                 选择合作方式<van-icon name="arrow-down" />
                 <van-transition show="{{dropDownList}}" class="pattern-item-box" name="fade-down">
-                    <view class="pattern-item">
-                        <view wx:for="{{methodsList}}" >{{item}}</view>
+                    <view class="pattern-item" bindtap="modeSelect">
+                        <view wx:for="{{methodsList}}" data-index="{{index}}">{{item}}</view>
                     </view>
                 </van-transition>
             </view>
         </view>
     </view>
-</My_DisplayBox>
+</My_DisplayBox>
+
+<!-- 测试 -->
+<van-search
+  value="{{ addvalue }}"
+  label="地址"
+  placeholder="请输入搜索关键词"
+  use-action-slot
+  bind:change="onChange"
+  bind:search="onSearch"
+>
+  <view slot="action" bind:tap="onClick">搜索</view>
+</van-search>

+ 1 - 1
pages/businessPartner/details.wxml

@@ -10,7 +10,7 @@
             <van-switch checked="{{ checked }}" bind:change="onChange" />
         </My_GreyRectangleForm>
         <My_GreyRectangleForm title="合作方式" required>
-            <view class="right-text">商户名称</view>
+            <input style="background-color: brown; width: 200rpx;" readonly type="text"/>
         </My_GreyRectangleForm>
     </view>
 </My_GeneralTemplate>

+ 1 - 1
pages/businessPartner/index.wxml

@@ -1,5 +1,5 @@
 <view class="SearchInputBox">
-    <My_SearchInputBox inputColor="#D8D8D8" inputRadius="30" fisadministrator="{{true}}" butText="新合作" marTop="0"></My_SearchInputBox>
+    <My_SearchInputBox  inputColor="#D8D8D8" inputRadius="30" fisadministrator="{{true}}" butText="新合作" marTop="0" route="consociation"></My_SearchInputBox>
 </view>
 
 <My_DisplayBox title="商户列表" isMore="{{false}}">

+ 13 - 1
pages/liveStreaming/index.js

@@ -5,7 +5,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-
+        aa1:"小程序复制"
     },
 
     /**
@@ -14,6 +14,18 @@ Page({
     onLoad: function (options) {
 
     },
+    copyTheAddress(e){
+        wx.setClipboardData({
+            data: this.data.aa1,
+            success (res) {
+              wx.getClipboardData({
+                success (res) {
+                  console.log('内容已复制') // data
+                }
+              })
+            }
+          })
+    },
 
     /**
      * 生命周期函数--监听页面初次渲染完成

+ 2 - 2
pages/liveStreaming/index.wxml

@@ -8,7 +8,7 @@
         </view>
     </view>
     <!-- 直播信息 -->
-    <view wx:if="{{false}}" class="account-information">
+    <view wx:if="{{true}}" class="account-information">
         <view class="account-information-left">
             <view>
                 <text class="title">直播账号</text> 1000000000
@@ -22,7 +22,7 @@
                 <text class="title">开播时间</text> 2021-12-23 17:00
             </view>
             <view>
-                <text class="title">直播间地址 </text><text class="copy">www.jfc001.com/zb001</text>
+                <text class="title">直播间地址 </text><text class="copy" bindtap="copyTheAddress">www.jfc001.com/zb001</text>
             </view>
         </view>
     </view>

+ 1 - 1
pages/tabbar-pages/supplyAndDemand/particulars.wxml

@@ -11,7 +11,7 @@
             </view>
         </view>
         <!-- 产品详情 -->
-        <view style="margin-bottom: 15rpx;">{{particulars.fcontent}}</view>
+        <view style="overflow-wrap: break-word; margin-bottom: 15rpx;">{{particulars.fcontent}}</view>
         <view class="detailed-description">
             <image wx:for="{{particulars.attinfos}}" src="{{item.fobsurl}}" mode="widthFix" catchtap="previewImage"></image>
         </view>

+ 11 - 0
pages/tradeShow/index.wxml

@@ -41,6 +41,17 @@
 <My_DisplayBox title="热门展商" isMore="{{false}}">
     <!-- 标题前图片 -->
     <image slot="display-box-img" class="display-title_image" src="/static/icon-04.png" mode="aspectFit"></image>
+    <swiper class="exhibition-swiper" autoplay indicator-dots circular="true" indicator-active-color="#fff">
+        <swiper-item wx:for="{{3}}" class="exhibition-swiper-item">
+            <view wx:for="{{4}}" class="exhibition">
+                <image class="exhibition-img" src="/static/changeImg.png" mode="aspectFill" ></image>
+                <view class="exhibition-bottom">
+                    <view class="exhibition-bottom-title">65421</view>
+                    <view class="exhibition-bottom-data">185</view>
+                </view>
+            </view>
+        </swiper-item>
+    </swiper>
 </My_DisplayBox>
 
 <My_DisplayBox title="热门商品" isMore="{{false}}">

+ 1 - 1
project.private.config.json

@@ -103,7 +103,7 @@
                     "scene": null
                 },
                 {
-                    "name": "",
+                    "name": "请求合作",
                     "pathName": "pages/businessPartner/applyFor",
                     "query": "",
                     "scene": null