wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分享中心入口以及分销订单入口修改

Browse Source
version/0412
zhangtianning 9 months ago
parent 6788825e12
commit 337458993b
7 changed files with 131 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      .idea/misc.xml
  2. 8
      .idea/modules.xml
  3. 6
      .idea/vcs.xml
  4. 64
      .idea/workspace.xml
  5. 9
      .idea/yanzong_qianduan.iml
  6. 10
      pages/news3/shopDealerOrder.vue
  7. 54
      pages/user/index.vue

6
.idea/misc.xml
Unescape View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

8
.idea/modules.xml
Unescape View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/yanzong_qianduan.iml" filepath="$PROJECT_DIR$/.idea/yanzong_qianduan.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml
Unescape View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

64
.idea/workspace.xml
Unescape View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9bef4bf5-aade-4c02-9012-bbc8fec848f0" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/components/goods-sku-popup/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/components/goods-sku-popup/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/cart/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/cart/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/goods/components/SkuPopup.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/goods/components/SkuPopup.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/goods/detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/goods/detail.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/invoice/indexset.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/invoice/indexset.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/news/park/browsingHistory.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/news/park/browsingHistory.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/news/recycling/confirm1.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/news/recycling/confirm1.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/news/recycling/order.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/news/recycling/order.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/news/recycling/orderList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/news/recycling/orderList.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/news/user/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/news/user/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/news3/ManualEntry.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/news3/ManualEntry.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/news3/seasoningCondimentsRecord.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/news3/seasoningCondimentsRecord.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/order/detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order/detail.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/order/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/order/refund/refund.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order/refund/refund.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/sureOrder/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/sureOrder/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/user/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/user/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/static/detail/buy.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/static/detail/priceback.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/static/detail/pro.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/static/weixiu.png" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProjectId" id="2csvnkKiehY0MbsRW3bGP7kwr64" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"last_opened_file_path": "/Users/zhangtianning/work/job_liu/goodCity/yanzong_qianduan",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="9bef4bf5-aade-4c02-9012-bbc8fec848f0" name="Changes" comment="" />
<created>1708913269339</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1708913269339</updated>
<workItem from="1708913291435" duration="655000" />
</task>
<servers />
</component>
</project>

9
.idea/yanzong_qianduan.iml
Unescape View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

10
pages/news3/shopDealerOrder.vue
Unescape View File

@ -243,12 +243,14 @@ export default {
}
},
onReady() {
this.getList()
onReady(options) {
// this.getList()
},
onLoad() {
onLoad(options) {console.log('--------');
// console.log(options);
this.classifyShow=options.type;
this.getList();
},
onPageScroll(e){

54
pages/user/index.vue
Unescape View File

@ -243,41 +243,34 @@
<u-icon @click="goJump('/pages/news3/fenxiao')" style="margin-left: 5rpx; color: #909090; margin-top: -5rpx;" name="arrow-right"></u-icon>
</view>
<view class="grounding goodsOrder">
<view class="image-text_21" @click="goJump('/pages/news3/fenxiao?type=1')">
<view class="image-text_21" @click="goJump('/pages/news3/shopDealerOrder?type=pay')">
<image :src="$picUrl+'/static/user/unpay.png'" class="label_11"></image>
<view class="text-group_21">
<text lines="1" class="text_7" v-if="orderTodoInfo.distribution_order.payment_number">{{orderTodoInfo.distribution_order.payment_number}}</text>
<text lines="1" class="text_8">待付款</text>
</view>
</view>
<view class="image-text_21" @click="goJump('/pages/news3/fenxiao?type=2')">
<view class="image-text_21" @click="goJump('/pages/news3/shopDealerOrder?type=delivery')">
<image :src="$picUrl+'/static/user/unsend.png'" class="label_11"></image>
<view class="text-group_21">
<text lines="1" class="text_7" v-if="orderTodoInfo.distribution_order.delivery_number">{{orderTodoInfo.distribution_order.delivery_number}}</text>
<text lines="1" class="text_8">待发货</text>
</view>
</view>
<view class="image-text_21" @click="goJump('/pages/news3/fenxiao?type=7')">
<view class="image-text_21" @click="goJump('/pages/news3/shopDealerOrder?type=receipt')">
<image :src="$picUrl+'/static/user/untake.png'" class="label_11"></image>
<view class="text-group_21">
<text lines="1" class="text_7" v-if="orderTodoInfo.distribution_order.received_number">{{orderTodoInfo.distribution_order.received_number}}</text>
<text lines="1" class="text_8">待收货</text>
</view>
</view>
<view class="image-text_21" @click="goJump('/pages/news3/fenxiao?type=5')">
<view class="image-text_21" @click="goJump('/pages/news3/shopDealerOrder?type=complete')">
<image :src="$picUrl+'/static/user/over.png'" class="label_11"></image>
<view class="text-group_21">
<text lines="1" class="text_7" v-if="orderTodoInfo.distribution_order.finish_number">{{orderTodoInfo.distribution_order.finish_number}}</text>
<text lines="1" class="text_8">已完成</text>
</view>
</view>
<view class="image-text_21" @click="goJump('/pages/news3/fenxiao?type=4')">
<image :src="$picUrl+'/static/user/detail.png'" class="label_11"></image>
<view class="text-group_21">
<text lines="1" class="text_7" v-if="orderTodoInfo.distribution_order.retund_number">{{orderTodoInfo.distribution_order.retund_number}}</text>
<text lines="1" class="text_8">退款中</text>
</view>
</view>
</view>
</view>
<view class="wallet">
@ -401,11 +394,17 @@
邀请朋友
</view>
</view>
<view class="serveIcon" @click="goJump('/pages/invite/index')">
<!-- <view class="serveIcon" @click="goJump('/pages/invite/index')"> -->
<view class="serveIcon" v-if="userInfo.user_type ==30" @click="goDealer(userInfo.user_type)">
<image :src="$picUrl+'/static/user/invites.png'" class="icons"></image>
<view class="serveInfo">
<text>分销中心</text>
</view>
</view>
<view class="serveIcon" v-if="userInfo.user_type == 10 || userInfo.user_type == 20" @click="goDealer(userInfo.user_type)">
<image :src="$picUrl+'/static/user/invites.png'" class="icons"></image>
<view class="serveInfo">
<text v-if="userInfo.user_type >=30">邀请分销</text>
<text v-else >加入分销</text>
<text>加入分销</text>
</view>
</view>
@ -534,6 +533,17 @@
}
},
methods: {
goDealer(type){
if(type==30){
this.goJump('/pages/news3/JoinDistribution?dataType=all');
}else if(type==10 || type==20){
uni.showToast({
title: '请先购买分销会员',
icon: 'none',
duration: 2000
})
}
},
openScrollTo(){
uni.pageScrollTo({
scrollTop: 0
@ -694,14 +704,14 @@
})
},
goGoodsOrder(val) {
if(this.isLogin == false){
this.goLogin()
return;
}
// 我的订单
uni.navigateTo({
url: '/pages/order/index?dataType=' + val
})
// if(this.isLogin == false){
// this.goLogin()
// return;
// }
// // 我的订单
// uni.navigateTo({
// url: '/pages/order/index?dataType=' + val
// })
},
goodsDetail(item) {
// 跳转商品详情

Write Preview
Loading…
Cancel
Save