wxd / MShopWeApp

Commit 7a982d8d9fbd420da1dff7066066412ae9677cb5

Authored by WXD-SEASON\season
1 parent d0c02c82

冲突

Inline Side-by-side
Showing 1 changed file with 0 additions and 19 deletions
packageE/pages/qy/contactMe/contactMe.js
  View file @7a982d8
... ... @@ -152,24 +152,6 @@ Page({
152 152 console.log(res);
153 153 if (res.data.code == 0) {
154 154 // let resdata=JSON.parse(res.data.data);
155   -<<<<<<< HEAD
156   - let openuserid=res.data.data.openuserid;
157   - let skip_verify=res.data.data.skip_verify;
158   - this.setData({
159   - openuserid,
160   - skip_verify
161   - })
162   - }
163   - })
164   - },
165   - async getqy(){
166   - wx.showLoading({
167   - title: '加载中',
168   - mask:true
169   - })
170   - let openuserid=this.data.openuserid
171   - let skip_verify=this.data.skip_verify ? true : false
172   -=======
173 155 let openuserid = res.data.data.openuserid;
174 156 let skip_verify = res.data.data.skip_verify;
175 157 this.setData({
... ... @@ -189,7 +171,6 @@ Page({
189 171 // })
190 172 let openuserid = this.data.openuserid
191 173 let skip_verify = this.data.skip_verify ? true : false
192   ->>>>>>> dev_oa_chen9
193 174 let res = await getApp().request.promisePost(`/apib/weshop/admin/qyWeChat/qyWeChatCorpInfo/postAdminQyApi?accdb=${this.data.store.erpid}&url=externalcontact/add_contact_way`, {
194 175 data: {
195 176 // accdb: getApp().globalData.config.erpid,
... ...