Merge remote-tracking branch 'remotes/origin/wanghao'

my/renzheng/editCompany.vue

@@ -21,7 +21,7 @@
             />
           </view>
         </view>
-        <view class="ms-item-content" v-if="baseMsg" @click="goEditCompanyInfo">
+        <view class="ms-item-content" v-if="baseMsg" @click="goCompanyMsg">
           <view class="name-content-item">
             <view class="name-item">品牌logo</view>
             <view class="value-item">
@@ -262,9 +262,6 @@ export default {
     },
     goCompanyMsg(){
         uni.navigateTo({ url: '/my/renzheng/companyMsg' })
-    },
-    goEditCompanyInfo(){
-        uni.navigateTo({ url: '/my/renzheng/index' })
     },
 	// 查询用户企业状态
 	getcompanystatus() {

pages/my/index.vue

@@ -522,7 +522,7 @@
 					</view>
 
 					<!-- 我的钱包 -->
-					<view class="money flex justify-center" v-if="XCXIsSelect != '否'">
+					<!-- <view class="money flex justify-center" v-if="XCXIsSelect != '否'">
 						<view class="money-box flex justify-center align-center">
 							<view class="money-box-c flex justify-between">
 								<view class="money-box-c-l flex flex-wrap" @click="goNav('/my/wallet/wallet')">
@@ -538,7 +538,7 @@
 								</view>
 							</view>
 						</view>
-					</view>
+					</view> -->
 
 					<!-- 我的招聘 -->
 					<!-- <view