companyProjecet.git

quanwei

2025-12-09 ca425b889f3c1b5847ffc26a0229307f7f8ef43e

refs
author	quanwei <419654421@qq.com>
	Tuesday, December 9, 2025 16:11 +0800
committer	quanwei <419654421@qq.com>
	Tuesday, December 9, 2025 16:11 +0800
commit	ca425b889f3c1b5847ffc26a0229307f7f8ef43e
tree	ed46731e9d62ef6034cdccb639656391f885902f tree \| zip \| gz
parent	feda780069d64479c0c20493603717e100655da9 view \| diff

添加消费券
商户端添加页面diy

122 files added

40 files modified

	admin/app/agent/model/product/Comment.php	2 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/api/controller/consumption/Log.php	31 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/api/controller/supplier/Page.php	217 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/api/model/store/Store.php	4 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/api/model/supplier/page/Page.php	252 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/api/model/user/ConsumptionLog.php	23 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/api/service/consumption/ConsumptionDeductService.php	83 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/api/service/order/settled/AdvanceSettledService.php	4 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/api/service/order/settled/BranchActivitySettledService.php	21 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/api/service/order/settled/MasterOrderSettledService.php	6 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/api/service/order/settled/OrderSettledService.php	148 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/enum/settings/SettingEnum.php	6 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/plus/shareholder/Apply.php	4 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/Capital.php	26 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/Cart.php	231 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/Cash.php	64 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/DemandApply.php	82 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/DemandProject.php	157 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/DemandUser.php	67 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/Order.php	109 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/Project.php	70 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/ReleaseCategory.php	41 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/ReleaseProjectImage.php	33 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/ReleaseProjectTag.php	47 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/Setting.php	398 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/SupplyApply.php	82 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/SupplyProject.php	186 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/SupplyUser.php	67 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/release/Tag.php	35 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/settings/Setting.php	21 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/supplier/Supplier.php	12 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/supplier/User.php	12 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/supplier/page/Page.php	809 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/user/ConsumptionLog.php	41 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/model/user/User.php	50 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/service/delivery/ExpressService.php	4 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/common/service/order/OrderCompleteService.php	44 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/job/event/VipUserGrade.php	3 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/shop/controller/product/Product.php	16 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/shop/controller/user/Consumption.php	40 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/shop/model/product/Comment.php	2 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/shop/model/user/ConsumptionLog.php	37 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/supplier/controller/product/Product.php	7 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/supplier/controller/supplier/Page.php	254 ●●●●● diff \| view \| raw \| blame \| history
	admin/app/supplier/model/supplier/page/Page.php	89 ●●●●● diff \| view \| raw \| blame \| history
	mobile/main.js	10 ●●●●● diff \| view \| raw \| blame \| history
	mobile/pages.json	9 ●●●●● diff \| view \| raw \| blame \| history
	mobile/pages/order/confirm-order.vue	30 ●●●●● diff \| view \| raw \| blame \| history
	mobile/pages/order/pay-success/pay-success.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	mobile/pages/shop/shop.vue	540 ●●●●● diff \| view \| raw \| blame \| history
	mobile/pages/shop/shop_list.vue	7 ●●●●● diff \| view \| raw \| blame \| history
	mobile/pages/tabBar/user/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	mobile/pages/user/index/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	mobile/store/index.js	6 ●●●●● diff \| view \| raw \| blame \| history
	shop_vue/src/api/consumption.js	17 ●●●●● diff \| view \| raw \| blame \| history
	shop_vue/src/views/product/product/add.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	shop_vue/src/views/product/product/edit.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	shop_vue/src/views/product/product/index.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	shop_vue/src/views/product/product/part/Basic.vue	29 ●●●●● diff \| view \| raw \| blame \| history
	shop_vue/src/views/product/product/part/Buyset.vue	23 ●●●●● diff \| view \| raw \| blame \| history
	shop_vue/src/views/product/product/part/spec/Single.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	shop_vue/src/views/product/product/part/spec/many/Table.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	shop_vue/src/views/user/consumption/index.vue	42 ●●●●● diff \| view \| raw \| blame \| history
	shop_vue/src/views/user/consumption/part/Log.vue	134 ●●●●● diff \| view \| raw \| blame \| history
	shop_vue/src/views/user/consumption/part/Setting.vue	172 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/api/link.js	12 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/api/page.js	119 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/assets/img/category_40.jpg	diff \| view \| raw \| blame \| history
	supplier_vue/src/assets/img/theme1.jpg	diff \| view \| raw \| blame \| history
	supplier_vue/src/assets/img/theme2.jpg	diff \| view \| raw \| blame \| history
	supplier_vue/src/assets/img/theme3.jpg	diff \| view \| raw \| blame \| history
	supplier_vue/src/assets/img/theme4.jpg	diff \| view \| raw \| blame \| history
	supplier_vue/src/assets/img/theme5.jpg	diff \| view \| raw \| blame \| history
	supplier_vue/src/assets/img/theme6.jpg	diff \| view \| raw \| blame \| history
	supplier_vue/src/assets/img/theme7.jpg	diff \| view \| raw \| blame \| history
	supplier_vue/src/components/setlink/SetTab.vue	102 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/components/setlink/part/Article.vue	131 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/components/setlink/part/DiyPage.vue	66 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/components/setlink/part/H5.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/components/setlink/part/Marketing.vue	175 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/components/setlink/part/Menu.vue	165 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/components/setlink/part/Pages.vue	117 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/components/setlink/part/SmallProgram.vue	39 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/components/setlink/part/Store.vue	146 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/add.vue	137 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/addpage.vue	136 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/bottom/Edit.vue	133 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/bottomnav.vue	332 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/category.vue	111 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/Model.vue	313 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/Params.vue	407 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/Preview.vue	322 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/Type.vue	72 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Article.vue	77 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Banner.vue	120 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/BargainProduct.vue	193 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Blank.vue	36 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Button.vue	58 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Coupon.vue	106 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Guide.vue	36 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/ImageSingle.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Live.vue	93 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/NavBar.vue	50 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Notice.vue	44 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Preview.vue	173 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Product.vue	211 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/RichText.vue	37 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Search.vue	50 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Seckill.vue	165 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Service.vue	44 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Setpages.vue	77 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Special.vue	54 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Store.vue	70 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Tab.vue	66 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Title.vue	78 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Video.vue	41 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/Window.vue	81 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/model/assembleProduct.vue	221 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Article.vue	77 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Banner.vue	112 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/BargainProduct.vue	97 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Blank.vue	46 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Button.vue	99 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Coupon.vue	41 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Guide.vue	62 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/ImageSingle.vue	93 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Live.vue	55 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/NavBar.vue	104 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Notice.vue	62 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Preview.vue	83 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Product.vue	246 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/RichText.vue	69 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Search.vue	47 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Seckill.vue	79 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Service.vue	60 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Setpages.vue	97 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Special.vue	87 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Store.vue	102 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Tab.vue	118 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Title.vue	68 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Video.vue	72 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/Window.vue	98 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/diy/params/assembleProduct.vue	58 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/edit.vue	141 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/editpage.vue	138 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/home.vue	129 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/index.vue	190 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/list.vue	231 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/mymenu/add.vue	188 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/mymenu/edit.vue	197 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/mymenu/index.vue	212 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/page/nav.vue	267 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/page/theme/index.vue	146 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/product/product/add.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/product/product/edit.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/product/product/part/Basic.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/product/product/part/Buyset.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/product/product/part/spec/Single.vue	3 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/product/product/part/spec/many/Table.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/user/consumption/index.vue	42 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/user/consumption/part/Log.vue	134 ●●●●● diff \| view \| raw \| blame \| history
	supplier_vue/src/views/user/consumption/part/Setting.vue	172 ●●●●● diff \| view \| raw \| blame \| history