同步

app.json

@@ -40,7 +40,9 @@
     "pages/messageDetail/index",
 
     "pages/secret/index",
-    "pages/serviceTerm/index"
+    "pages/serviceTerm/index",
+    "pages/mineAgency/index"
+
   ],
   "permission": {
     "scope.userLocation": {

app.wxss

@@ -4,17 +4,10 @@
 page {
 	height: 100vh;
 	background: #f5f5f5;
-<<<<<<< HEAD
-	--color-ysd: #00B666;
-	--color-hover: #ebfaf4;
-  --color-be: #ff4400;
-  --color-f40: #ff4400;
-=======
 	--color-ysd: #00b666;
 	--color-hover: #3393ff;
 	--color-be: #ff4400;
 	--color-f40: #ff4400;
->>>>>>> 1628dadd3c48137b944d348038f60649f28cf760
 	--color-027: #ff4400;
 }
 ::-webkit-scrollbar {

pages/detail/index.wxml

@@ -429,7 +429,7 @@
     </view>
   </scroll-view>
 </view>
-<view class="bottomBtn" style="padding-bottom:calc(constant(safe-area-inset-bottom) + 12px);padding-bottom:calc(env(safe-area-inset-bottom) + 12px);">
+<view class="bottomBtn" style="padding-bottom:calc(constant(safe-area-inset-bottom) + 12px);padding-bottom:calc(env(safe-area-inset-bottom) + 12px)">
   <view class="norecruit" wx:if="{{isMaskShow}}">该职位暂时停招</view>
   <view class="fsa tc bottomBox">
     <!-- <view class="flex-1 pl16" style="" bindtap="showphone">
@@ -463,27 +463,15 @@
       <button class="loginOut" type hover-class="none" style="background-color:#ccc;width: 260px;" hover-stop-propagation>已报名</button>
     </view>
     <view wx:else>
-<<<<<<< HEAD
-    <view class="" wx:if="{{fromScene}}">
-      <button class="loginOut wxBtn ysd-base-bgcolor" hover-class="loginBtnHov" bindtap="backIndex">返回首页</button>
-    </view>
-    <view class="" wx:if="{{!isMaskShow}}">
-      <button type="primary" style="width: {{!fromScene ? '260px' :''}};" hover-class="thover" class="loginOut" bindtap="goNewEnroll">立即报名</button>
-    </view>
-    <view class="" wx:else>
-      <button class="loginOut" type hover-class="none" style="background-color:#ccc;width: {{!fromScene ? '260px' :''}};" hover-stop-propagation>暂时停招</button>
-=======
       <view class wx:if="{{fromScene}}">
         <button class="loginOut wxBtn ysd-base-bgcolor" hover-class="loginBtnHov" bindtap="backIndex">返回首页</button>
       </view>
       <view class wx:if="{{!isMaskShow}}">
-        <button type="primary" style="width: {{!fromScene ? '260px' :''}};" class="loginOut" bindtap="goNewEnroll">立即报名</button>
+        <button type="primary" style="width: {{!fromScene ? '260px' :''}};" hover-class="thover" class="loginOut" bindtap="goNewEnroll">立即报名</button>
       </view>
       <view class wx:else>
         <button class="loginOut" type hover-class="none" style="background-color:#ccc;width: {{!fromScene ? '260px' :''}};" hover-stop-propagation>暂时停招</button>
       </view>
->>>>>>> 1628dadd3c48137b944d348038f60649f28cf760
-    </view>
     </view>
   </view>
   <view class="mask" wx:if="{{isMaskShow}}"></view>
@@ -534,9 +522,10 @@
         </view>
         <view class="mt8 f11 tal cccc mb24 pl4" style="width:90%" hover-class="none" hover-stop-propagation="false">注意：不同的报名人如果填写同一个手机号，报名提交将会失败。</view>
       </view>
-    <view class='fsa pl32 pr32 mb24' hover-class="none" hover-stop-propagation="false">
+      <view class="fsa pl32 pr32 mb24" hover-class="none" hover-stop-propagation="false">
         <button class="nobg_Btn normalBtn mr16" style type role="button" bindtap>我再想想</button>
         <button class="bgBtn normalBtn" style type="primary" role="button" bindtap>确认报名</button>
       </view>
     </view>
   </view>
+</view>

pages/mine/index.wxml

@@ -76,7 +76,7 @@
       </view>
     </view>
   </navigator>
-  <navigator class url="{{isLogin? '/pages/collect/index?from=baoming': '/pages/login/index'}}"  hover-class="none" hover-stop-propagation="false">
+  <navigator class url="{{isLogin? '/pages/mineAgency/index': '/pages/login/index'}}"  hover-class="none" hover-stop-propagation="false">
 
     <view class="bt1" hover-class="none" style="background-color:#fff" hover-stop-propagation="false">
       <view class="setting" hover-class="thover">

pages/mineAgency/index.js

@@ -0,0 +1,66 @@
+// pages/mineAgency/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/mineAgency/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "我的代理",
+  "usingComponents": {}
+}

pages/mineAgency/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/mineAgency/index.wxml-->
+<text>pages/mineAgency/index.wxml</text>

pages/mineAgency/index.wxss

@@ -0,0 +1 @@
+/* pages/mineAgency/index.wxss */