零售花店修改店名称

ghsApp/src/pagesOrder/detail.vue

@@ -43,7 +43,6 @@
 							<button class="admin-button-com mini-btn" v-if="[-1, -2].includes(Number(detailInfo.sendStatus)) && [2].includes(Number(detailInfo.status))" @click.stop="openExpressPage()">重叫跑腿</button>
 						</view>
 					</view>
-<!--
 					<view class="msg-list express-progress-row">
 						<view class="label">小费：</view>
 						<view class="value">
@@ -53,7 +52,6 @@
 							<button class="admin-button-com mini-btn" v-if="canAddTip(detailInfo.sendStatus)" @click.stop="addTip(detailInfo.id, detailInfo.deliveryId)">添加小费</button>
 						</view>
 					</view>
--->
 				</view>
 			</view>
 
@@ -270,7 +268,7 @@
 							<block v-if="detailInfo.book == 1 && detailInfo.status == 2 && parseFloat(detailInfo.actPrice) == 0">
 							</block>
 							<block v-else>
-								<text style="position:absolute;left:155upx;top:103upx;color:#3385FF;" @click="giveItemFn(s)">发起赠送</text>
+								<text style="position:absolute;left:155upx;top:103upx;color:#3385FF;" @click="giveItemFn(s)">{{ s.ratioType == 1 ? '若干支装' : (s.ratioType == 0 ? s.ratio + '支装' : '发起赠送') }}</text>
 							</block>
 
 							<text v-if="detailInfo.book == 1" style="position:absolute;left:155upx;top:65upx;color:#999999;">预订 {{ parseFloat(s.xhPreNum) }}{{s.xhUnitName}} x ¥{{ s.xhUnitPrice?parseFloat(s.xhUnitPrice):0 }}</text>

hdApp/src/admin/home/edit.vue

@@ -0,0 +1,85 @@
+<template>
+	<div class="app-content">
+		<form @submit="formSubmit">
+			<div class="module-com input-line-wrap">
+				<tui-list-cell class="line-cell" :hover="false">
+					<div class="tui-title">名称</div>
+					<input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请填写" type="nickname" />
+				</tui-list-cell>
+				<div class="btn-wrap">
+					<button class="button-com red big" formType="submit">修改</button>
+				</div>
+				<div class="btn-wrap">
+					<button class="button-com default big" @click="back">返回</button>
+				</div>
+			</div>
+		</form>
+	</div>
+</template>
+<script>
+import TuiListCell from '@/components/plugin/list-cell'
+import { modifySjName } from "@/api/shop";
+export default {
+	name: 'edit',
+	components: {
+		TuiListCell
+	},
+	data() {
+		return {
+			form: {
+				name: ''
+			},
+		}
+	},
+	methods: {
+		init(){	},
+
+		formSubmit(){
+			modifySjName(this.form).then(res=>{
+				if(res.code == 1){
+					this.$msg('修改成功')
+					setTimeout(() => {
+						uni.navigateBack({})
+					}, 1000);
+				}
+			})
+		},
+		back(){
+			uni.navigateBack({})
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+	// 公共
+	.line-cell {
+		.tui-title {
+			width: 210upx;
+			color: $fontColor2;
+			line-height: 80upx;
+		}
+		.tui-input {
+			width: calc(100% - 210upx);
+			font-size: 28upx;
+			min-height: 80upx;
+			padding: 20upx;
+		}
+		.phcolor {
+			color: #ccc;
+		}
+	}
+	.btn-wrap {
+		width: 90%;
+		margin: 60upx auto;
+		.button-com {
+			width: 100%;
+			margin: 0 auto;
+			min-height: 100upx;
+			padding: 30upx;
+			font-size: 32upx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+</style>

hdApp/src/admin/home/workbench.vue

@@ -298,11 +298,11 @@
                 />
               </button>
             </view>
-            <view class="user-info">
+            <view class="user-info" @click="pageTo({url:'/admin/home/edit'})">
               <text class="username">{{ (shopInfo && shopInfo.shopName == '首店') ? (shopInfo.merchantName || '') : (((shopInfo && shopInfo.merchantName) ? shopInfo.merchantName : '') + (shopInfo && shopInfo.shopName ? (' ' + shopInfo.shopName) : '')) }}</text>
               <text class="user-id">ID {{ shopInfo && shopInfo.id ? shopInfo.id : '' }}</text>
             </view>
-            <view class="more-icon">
+            <view class="more-icon" @click="pageTo({url:'/admin/home/edit'})">
               <zui-svg-icon icon="home-more" :width="26" color="#FFFFFF" />
             </view>
           </view>

hdApp/src/pages.json

@@ -11,6 +11,7 @@
 		{"path": "admin/home/register","style": {"navigationBarTitleText": "服务协议"}},
 		{"path": "admin/home/privacy","style": {"navigationBarTitleText": "隐私政策"}},
 		{ "path": "admin/home/me", "style": { "navigationBarTitleText": "我的", "enablePullDownRefresh": true, "navigationStyle": "custom" } },
+		{ "path": "admin/home/edit", "style": { "navigationBarTitleText": "花店信息" } },
 		{"path": "common/success","style": {"navigationBarBackgroundColor": "#ffffff","navigationBarTextStyle": "black"}},
 		{"path": "common/webview","style": {"navigationBarTitleText": "网页","navigationBarBackgroundColor": "#ffffff","navigationBarTextStyle": "black"}}
 	],